You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2022/06/30 02:56:26 UTC

[db-jdo] branch main updated: JDO-815 update license headers from http: to https:

This is an automated email from the ASF dual-hosted git repository.

clr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/db-jdo.git


The following commit(s) were added to refs/heads/main by this push:
     new 1a458c1a JDO-815 update license headers from http: to https:
1a458c1a is described below

commit 1a458c1ae77c7a9c3b8e986beb1b2ddaaf061b95
Author: Craig L Russell <ap...@gmail.com>
AuthorDate: Wed Jun 29 19:56:09 2022 -0700

    JDO-815 update license headers from http: to https:
---
 LICENSE                                                          | 2 +-
 NOTICE                                                           | 2 +-
 README.md                                                        | 2 +-
 api/pom.xml                                                      | 2 +-
 api/src/main/java/javax/jdo/AttributeConverter.java              | 2 +-
 api/src/main/java/javax/jdo/Constants.java                       | 2 +-
 api/src/main/java/javax/jdo/Enhancer.java                        | 2 +-
 api/src/main/java/javax/jdo/Extent.java                          | 2 +-
 api/src/main/java/javax/jdo/FetchGroup.java                      | 2 +-
 api/src/main/java/javax/jdo/FetchPlan.java                       | 2 +-
 api/src/main/java/javax/jdo/InstanceCallbacks.java               | 2 +-
 api/src/main/java/javax/jdo/JDOCanRetryException.java            | 2 +-
 api/src/main/java/javax/jdo/JDODataStoreException.java           | 2 +-
 api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java | 2 +-
 api/src/main/java/javax/jdo/JDOEnhanceException.java             | 2 +-
 api/src/main/java/javax/jdo/JDOEnhancer.java                     | 2 +-
 api/src/main/java/javax/jdo/JDOException.java                    | 2 +-
 api/src/main/java/javax/jdo/JDOFatalDataStoreException.java      | 2 +-
 api/src/main/java/javax/jdo/JDOFatalException.java               | 2 +-
 api/src/main/java/javax/jdo/JDOFatalInternalException.java       | 2 +-
 api/src/main/java/javax/jdo/JDOFatalUserException.java           | 2 +-
 api/src/main/java/javax/jdo/JDOHelper.java                       | 2 +-
 api/src/main/java/javax/jdo/JDONullIdentityException.java        | 2 +-
 api/src/main/java/javax/jdo/JDOObjectNotFoundException.java      | 2 +-
 .../main/java/javax/jdo/JDOOptimisticVerificationException.java  | 2 +-
 api/src/main/java/javax/jdo/JDOQLTypedQuery.java                 | 2 +-
 api/src/main/java/javax/jdo/JDOQLTypedSubquery.java              | 2 +-
 api/src/main/java/javax/jdo/JDOQueryInterruptedException.java    | 2 +-
 api/src/main/java/javax/jdo/JDOReadOnlyException.java            | 2 +-
 api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java   | 2 +-
 api/src/main/java/javax/jdo/JDOUserCallbackException.java        | 2 +-
 api/src/main/java/javax/jdo/JDOUserException.java                | 2 +-
 api/src/main/java/javax/jdo/LegacyJava.java                      | 2 +-
 api/src/main/java/javax/jdo/ObjectState.java                     | 2 +-
 api/src/main/java/javax/jdo/PersistenceManager.java              | 2 +-
 api/src/main/java/javax/jdo/PersistenceManagerFactory.java       | 2 +-
 api/src/main/java/javax/jdo/Query.java                           | 2 +-
 api/src/main/java/javax/jdo/Transaction.java                     | 2 +-
 api/src/main/java/javax/jdo/annotations/Cacheable.java           | 2 +-
 api/src/main/java/javax/jdo/annotations/Column.java              | 2 +-
 api/src/main/java/javax/jdo/annotations/Columns.java             | 2 +-
 api/src/main/java/javax/jdo/annotations/Convert.java             | 2 +-
 api/src/main/java/javax/jdo/annotations/DatastoreIdentity.java   | 2 +-
 api/src/main/java/javax/jdo/annotations/Discriminator.java       | 2 +-
 .../main/java/javax/jdo/annotations/DiscriminatorStrategy.java   | 2 +-
 api/src/main/java/javax/jdo/annotations/Element.java             | 2 +-
 api/src/main/java/javax/jdo/annotations/Embedded.java            | 2 +-
 api/src/main/java/javax/jdo/annotations/EmbeddedOnly.java        | 2 +-
 api/src/main/java/javax/jdo/annotations/Extension.java           | 2 +-
 api/src/main/java/javax/jdo/annotations/Extensions.java          | 2 +-
 api/src/main/java/javax/jdo/annotations/FetchGroup.java          | 2 +-
 api/src/main/java/javax/jdo/annotations/FetchGroups.java         | 2 +-
 api/src/main/java/javax/jdo/annotations/FetchPlan.java           | 2 +-
 api/src/main/java/javax/jdo/annotations/FetchPlans.java          | 2 +-
 api/src/main/java/javax/jdo/annotations/ForeignKey.java          | 2 +-
 api/src/main/java/javax/jdo/annotations/ForeignKeyAction.java    | 2 +-
 api/src/main/java/javax/jdo/annotations/ForeignKeys.java         | 2 +-
 api/src/main/java/javax/jdo/annotations/IdGeneratorStrategy.java | 2 +-
 api/src/main/java/javax/jdo/annotations/IdentityType.java        | 2 +-
 api/src/main/java/javax/jdo/annotations/Index.java               | 2 +-
 api/src/main/java/javax/jdo/annotations/Indices.java             | 2 +-
 api/src/main/java/javax/jdo/annotations/Inheritance.java         | 2 +-
 api/src/main/java/javax/jdo/annotations/InheritanceStrategy.java | 2 +-
 api/src/main/java/javax/jdo/annotations/Join.java                | 2 +-
 api/src/main/java/javax/jdo/annotations/Joins.java               | 2 +-
 api/src/main/java/javax/jdo/annotations/Key.java                 | 2 +-
 api/src/main/java/javax/jdo/annotations/NotPersistent.java       | 2 +-
 api/src/main/java/javax/jdo/annotations/NullValue.java           | 2 +-
 api/src/main/java/javax/jdo/annotations/Order.java               | 2 +-
 api/src/main/java/javax/jdo/annotations/PersistenceAware.java    | 2 +-
 api/src/main/java/javax/jdo/annotations/PersistenceCapable.java  | 2 +-
 api/src/main/java/javax/jdo/annotations/PersistenceModifier.java | 2 +-
 api/src/main/java/javax/jdo/annotations/Persistent.java          | 2 +-
 api/src/main/java/javax/jdo/annotations/PrimaryKey.java          | 2 +-
 api/src/main/java/javax/jdo/annotations/Queries.java             | 2 +-
 api/src/main/java/javax/jdo/annotations/Query.java               | 2 +-
 api/src/main/java/javax/jdo/annotations/Sequence.java            | 2 +-
 api/src/main/java/javax/jdo/annotations/SequenceStrategy.java    | 2 +-
 api/src/main/java/javax/jdo/annotations/Serialized.java          | 2 +-
 api/src/main/java/javax/jdo/annotations/Transactional.java       | 2 +-
 api/src/main/java/javax/jdo/annotations/Unique.java              | 2 +-
 api/src/main/java/javax/jdo/annotations/Uniques.java             | 2 +-
 api/src/main/java/javax/jdo/annotations/Value.java               | 2 +-
 api/src/main/java/javax/jdo/annotations/Version.java             | 2 +-
 api/src/main/java/javax/jdo/annotations/VersionStrategy.java     | 2 +-
 api/src/main/java/javax/jdo/datastore/DataStoreCache.java        | 2 +-
 api/src/main/java/javax/jdo/datastore/JDOConnection.java         | 2 +-
 api/src/main/java/javax/jdo/datastore/Sequence.java              | 2 +-
 api/src/main/java/javax/jdo/datastore/package.html               | 2 +-
 api/src/main/java/javax/jdo/identity/ByteIdentity.java           | 2 +-
 api/src/main/java/javax/jdo/identity/CharIdentity.java           | 2 +-
 api/src/main/java/javax/jdo/identity/IntIdentity.java            | 2 +-
 api/src/main/java/javax/jdo/identity/LongIdentity.java           | 2 +-
 api/src/main/java/javax/jdo/identity/ObjectIdentity.java         | 2 +-
 api/src/main/java/javax/jdo/identity/ShortIdentity.java          | 2 +-
 api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java    | 2 +-
 api/src/main/java/javax/jdo/identity/StringIdentity.java         | 2 +-
 api/src/main/java/javax/jdo/identity/package.html                | 2 +-
 api/src/main/java/javax/jdo/listener/AttachCallback.java         | 2 +-
 .../main/java/javax/jdo/listener/AttachLifecycleListener.java    | 2 +-
 api/src/main/java/javax/jdo/listener/ClearCallback.java          | 2 +-
 api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java | 2 +-
 .../main/java/javax/jdo/listener/CreateLifecycleListener.java    | 2 +-
 api/src/main/java/javax/jdo/listener/DeleteCallback.java         | 2 +-
 .../main/java/javax/jdo/listener/DeleteLifecycleListener.java    | 2 +-
 api/src/main/java/javax/jdo/listener/DetachCallback.java         | 2 +-
 .../main/java/javax/jdo/listener/DetachLifecycleListener.java    | 2 +-
 api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java | 2 +-
 api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java | 2 +-
 .../main/java/javax/jdo/listener/InstanceLifecycleListener.java  | 2 +-
 api/src/main/java/javax/jdo/listener/LoadCallback.java           | 2 +-
 api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java  | 2 +-
 api/src/main/java/javax/jdo/listener/StoreCallback.java          | 2 +-
 api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java | 2 +-
 api/src/main/java/javax/jdo/listener/package.html                | 2 +-
 api/src/main/java/javax/jdo/metadata/ArrayMetadata.java          | 2 +-
 api/src/main/java/javax/jdo/metadata/ClassMetadata.java          | 2 +-
 .../main/java/javax/jdo/metadata/ClassPersistenceModifier.java   | 2 +-
 api/src/main/java/javax/jdo/metadata/CollectionMetadata.java     | 2 +-
 api/src/main/java/javax/jdo/metadata/ColumnMetadata.java         | 2 +-
 .../main/java/javax/jdo/metadata/DatastoreIdentityMetadata.java  | 2 +-
 api/src/main/java/javax/jdo/metadata/DiscriminatorMetadata.java  | 2 +-
 api/src/main/java/javax/jdo/metadata/ElementMetadata.java        | 2 +-
 api/src/main/java/javax/jdo/metadata/EmbeddedMetadata.java       | 2 +-
 api/src/main/java/javax/jdo/metadata/ExtensionMetadata.java      | 2 +-
 api/src/main/java/javax/jdo/metadata/FetchGroupMetadata.java     | 2 +-
 api/src/main/java/javax/jdo/metadata/FetchPlanMetadata.java      | 2 +-
 api/src/main/java/javax/jdo/metadata/FieldMetadata.java          | 2 +-
 api/src/main/java/javax/jdo/metadata/ForeignKeyMetadata.java     | 2 +-
 api/src/main/java/javax/jdo/metadata/IndexMetadata.java          | 2 +-
 api/src/main/java/javax/jdo/metadata/Indexed.java                | 2 +-
 api/src/main/java/javax/jdo/metadata/InheritanceMetadata.java    | 2 +-
 api/src/main/java/javax/jdo/metadata/InterfaceMetadata.java      | 2 +-
 api/src/main/java/javax/jdo/metadata/JDOMetadata.java            | 2 +-
 api/src/main/java/javax/jdo/metadata/JoinMetadata.java           | 2 +-
 api/src/main/java/javax/jdo/metadata/KeyMetadata.java            | 2 +-
 api/src/main/java/javax/jdo/metadata/MapMetadata.java            | 2 +-
 api/src/main/java/javax/jdo/metadata/MemberMetadata.java         | 2 +-
 api/src/main/java/javax/jdo/metadata/Metadata.java               | 2 +-
 api/src/main/java/javax/jdo/metadata/OrderMetadata.java          | 2 +-
 api/src/main/java/javax/jdo/metadata/PackageMetadata.java        | 2 +-
 api/src/main/java/javax/jdo/metadata/PrimaryKeyMetadata.java     | 2 +-
 api/src/main/java/javax/jdo/metadata/PropertyMetadata.java       | 2 +-
 api/src/main/java/javax/jdo/metadata/QueryMetadata.java          | 2 +-
 api/src/main/java/javax/jdo/metadata/SequenceMetadata.java       | 2 +-
 api/src/main/java/javax/jdo/metadata/TypeMetadata.java           | 2 +-
 api/src/main/java/javax/jdo/metadata/UniqueMetadata.java         | 2 +-
 api/src/main/java/javax/jdo/metadata/ValueMetadata.java          | 2 +-
 api/src/main/java/javax/jdo/metadata/VersionMetadata.java        | 2 +-
 api/src/main/java/javax/jdo/metadata/package.html                | 2 +-
 api/src/main/java/javax/jdo/package.html                         | 2 +-
 api/src/main/java/javax/jdo/query/BooleanExpression.java         | 2 +-
 api/src/main/java/javax/jdo/query/ByteExpression.java            | 2 +-
 api/src/main/java/javax/jdo/query/CharacterExpression.java       | 2 +-
 api/src/main/java/javax/jdo/query/CollectionExpression.java      | 2 +-
 api/src/main/java/javax/jdo/query/ComparableExpression.java      | 2 +-
 api/src/main/java/javax/jdo/query/DateExpression.java            | 2 +-
 api/src/main/java/javax/jdo/query/DateTimeExpression.java        | 2 +-
 api/src/main/java/javax/jdo/query/EnumExpression.java            | 2 +-
 api/src/main/java/javax/jdo/query/Expression.java                | 2 +-
 api/src/main/java/javax/jdo/query/IfThenElseExpression.java      | 2 +-
 api/src/main/java/javax/jdo/query/ListExpression.java            | 2 +-
 api/src/main/java/javax/jdo/query/LocalDateExpression.java       | 2 +-
 api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java   | 2 +-
 api/src/main/java/javax/jdo/query/LocalTimeExpression.java       | 2 +-
 api/src/main/java/javax/jdo/query/MapExpression.java             | 2 +-
 api/src/main/java/javax/jdo/query/NumericExpression.java         | 2 +-
 api/src/main/java/javax/jdo/query/ObjectExpression.java          | 2 +-
 api/src/main/java/javax/jdo/query/OptionalExpression.java        | 2 +-
 api/src/main/java/javax/jdo/query/OrderExpression.java           | 2 +-
 api/src/main/java/javax/jdo/query/PersistableExpression.java     | 2 +-
 api/src/main/java/javax/jdo/query/StringExpression.java          | 2 +-
 api/src/main/java/javax/jdo/query/SubqueryExpression.java        | 2 +-
 api/src/main/java/javax/jdo/query/TimeExpression.java            | 2 +-
 api/src/main/java/javax/jdo/query/package.html                   | 2 +-
 api/src/main/java/javax/jdo/spi/Detachable.java                  | 2 +-
 api/src/main/java/javax/jdo/spi/I18NHelper.java                  | 2 +-
 api/src/main/java/javax/jdo/spi/JDOImplHelper.java               | 2 +-
 api/src/main/java/javax/jdo/spi/JDOPermission.java               | 2 +-
 api/src/main/java/javax/jdo/spi/PersistenceCapable.java          | 2 +-
 api/src/main/java/javax/jdo/spi/RegisterClassEvent.java          | 2 +-
 api/src/main/java/javax/jdo/spi/RegisterClassListener.java       | 2 +-
 api/src/main/java/javax/jdo/spi/StateInterrogation.java          | 2 +-
 api/src/main/java/javax/jdo/spi/StateManager.java                | 2 +-
 api/src/main/java/javax/jdo/spi/package.html                     | 2 +-
 api/src/main/resources/javax/jdo/Bundle.properties               | 2 +-
 api/src/main/resources/javax/jdo/jdo_2_0.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_2_0.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_2_1.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_2_2.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_2_2.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_3_0.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_3_0.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_3_1.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_3_1.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_3_2.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/jdo_3_2.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_2_1.dtd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_2_1.xsd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_2_2.dtd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_2_2.xsd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_3_0.dtd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_3_0.xsd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_3_1.dtd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_3_1.xsd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd               | 2 +-
 api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd               | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_2_0.dtd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_2_0.xsd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_2_1.xsd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_2_2.dtd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_2_2.xsd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_3_0.dtd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_3_0.xsd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_3_1.dtd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_3_1.xsd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_3_2.dtd                | 2 +-
 api/src/main/resources/javax/jdo/jdoquery_3_2.xsd                | 2 +-
 api/src/main/resources/javax/jdo/orm_2_0.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_2_0.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_2_1.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_2_2.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_2_2.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_3_0.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_3_0.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_3_1.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_3_1.xsd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_3_2.dtd                     | 2 +-
 api/src/main/resources/javax/jdo/orm_3_2.xsd                     | 2 +-
 parent-pom/pom.xml                                               | 9 +++++++--
 pom.xml                                                          | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/building/Kitchen.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/building/MultifunctionOven.java   | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/building/Oven.java       | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/building/package.html    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java     | 2 +-
 .../apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java    | 2 +-
 .../tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java | 2 +-
 .../org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java | 2 +-
 .../org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java     | 2 +-
 .../java/org/apache/jdo/tck/pc/company/CompanyModelReader.java   | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java  | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/IAddress.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/ICompany.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/company/IDentalInsurance.java     | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/IDepartment.java | 2 +-
 .../java/org/apache/jdo/tck/pc/company/IFullTimeEmployee.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/IInsurance.java  | 2 +-
 .../java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/IProject.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/PICompany.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java   | 2 +-
 .../main/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java   | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/PIPerson.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/company/PIProject.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java     | 2 +-
 .../companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java | 2 +-
 .../pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java    | 2 +-
 .../CompanyFactoryAnnotatedFCConcreteDelegator.java              | 2 +-
 .../companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java  | 2 +-
 .../tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java | 2 +-
 .../companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java | 2 +-
 .../companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java  | 2 +-
 .../DatastoreIdDiscriminatorClassNameInheritanceNew.java         | 2 +-
 .../DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java  | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java   | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java      | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java  | 2 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java | 2 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java     | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java   | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java    | 2 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java       | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java      | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java  | 2 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java      | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java    | 2 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java      | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java    | 2 +-
 .../CompanyFactoryAnnotatedJPAAppConcrete.java                   | 2 +-
 .../pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java  | 2 +-
 .../CompanyFactoryAnnotatedPMFieldClassJPA.java                  | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java | 2 +-
 .../jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java    | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java  | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java    | 2 +-
 .../jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java   | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java   | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java  | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java | 2 +-
 .../companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java | 2 +-
 .../pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java    | 2 +-
 .../CompanyFactoryAnnotatedPCConcreteDelegator.java              | 2 +-
 .../companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java  | 2 +-
 .../tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java | 2 +-
 .../companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java   | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java      | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java  | 2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java | 2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java     | 2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java   | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java    | 2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java       | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java      | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java  | 2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java      | 2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java      | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java    | 2 +-
 .../pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java    | 2 +-
 .../tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java | 2 +-
 .../companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java   | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java   | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java      | 2 +-
 .../apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java  | 2 +-
 .../jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java     | 2 +-
 .../jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java   | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java    | 2 +-
 .../jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java       | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java   | 2 +-
 .../jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java      | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java  | 2 +-
 .../jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java      | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java    | 2 +-
 .../apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java | 2 +-
 .../pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java    | 2 +-
 .../pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java   | 2 +-
 .../jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java | 2 +-
 .../tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java | 2 +-
 .../tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java    | 2 +-
 .../jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java | 2 +-
 .../org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java   | 2 +-
 .../jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java      | 2 +-
 .../org/apache/jdo/tck/pc/companyListWithoutJoin/ICompany.java   | 2 +-
 .../apache/jdo/tck/pc/companyListWithoutJoin/IDepartment.java    | 2 +-
 .../org/apache/jdo/tck/pc/companyListWithoutJoin/IEmployee.java  | 2 +-
 .../jdo/tck/pc/companyListWithoutJoin/IFullTimeEmployee.java     | 2 +-
 .../jdo/tck/pc/companyListWithoutJoin/IPartTimeEmployee.java     | 2 +-
 .../org/apache/jdo/tck/pc/companyListWithoutJoin/IPerson.java    | 2 +-
 .../jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java      | 2 +-
 .../org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java     | 2 +-
 .../compositeAnnotation/ApplicationIdDiscriminatorClassName.java | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCPoint.java  | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCRect.java   | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPoint.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/converter/PCPointAnnotated.java   | 2 +-
 .../main/java/org/apache/jdo/tck/pc/converter/PCPointProp.java   | 2 +-
 .../org/apache/jdo/tck/pc/converter/PCPointPropAnnotated.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRect.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/converter/PCRectAnnotated.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java  | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java   | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java  | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java     | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java     | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java   | 2 +-
 .../main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java     | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java    | 2 +-
 .../main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java    | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java   | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java  | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java  | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java    | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java   | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java  | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java     | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java    | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java     | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java    | 2 +-
 .../jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java       | 2 +-
 .../jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java     | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java     | 2 +-
 .../jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java     | 2 +-
 .../jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java   | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java  | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java   | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java    | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java  | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java    | 2 +-
 .../main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java  | 2 +-
 .../main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java   | 2 +-
 .../jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java       | 2 +-
 .../jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java     | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java     | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/AllPersist.java  | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/AllPersist2.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/AllPersist3.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/AllPersist4.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/Constants.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/FieldSameName.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/FieldSameName2.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/FieldSameName3.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/FieldSameName4.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/TopNonPersist.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistB.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistC.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistD.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistE.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistF.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistG.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistH.java   | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/TopPersist.java  | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/TopPersistC.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/TopPersistD.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/TopPersistE.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/TopPersistF.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/TopPersistG.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/inheritance/TopPersistH.java | 2 +-
 .../jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java      | 2 +-
 .../pc/instancecallbacks/InstanceCallbackNonPersistFdsClass.java | 2 +-
 .../java/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java   | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCClass.java       | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint.java       | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java      | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRect.java        | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/mylib/Point.java         | 2 +-
 .../main/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java    | 2 +-
 .../main/java/org/apache/jdo/tck/pc/mylib/VersionedPCPoint.java  | 2 +-
 .../main/java/org/apache/jdo/tck/pc/newInstance/AAddress.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java     | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/newInstance/IAddress.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java     | 2 +-
 .../org/apache/jdo/tck/pc/query/JDOQLKeywordsAsFieldNames.java   | 2 +-
 .../main/java/org/apache/jdo/tck/pc/query/LocalDateSample.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/query/LocalDateTimeSample.java    | 2 +-
 .../main/java/org/apache/jdo/tck/pc/query/LocalTimeSample.java   | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/query/MathSample.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/query/NamedQueriesSample.java     | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/query/NoExtent.java      | 2 +-
 .../main/java/org/apache/jdo/tck/pc/query/OptionalSample.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/query/TimeSample.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Cart.java   | 2 +-
 .../main/java/org/apache/jdo/tck/pc/shoppingcart/CartEntry.java  | 2 +-
 .../main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java    | 2 +-
 .../java/org/apache/jdo/tck/pc/shoppingcart/Undetachable.java    | 2 +-
 .../tck/pc/singlefieldidentity/AbstractPCPointSingleField.java   | 2 +-
 .../java/org/apache/jdo/tck/pc/singlefieldidentity/Employee.java | 2 +-
 .../apache/jdo/tck/pc/singlefieldidentity/FullTimeEmployee.java  | 2 +-
 .../jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java   | 2 +-
 .../tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java  | 2 +-
 .../jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java   | 2 +-
 .../tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java    | 2 +-
 .../jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java   | 2 +-
 .../pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java  | 2 +-
 .../pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java  | 2 +-
 .../pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java   | 2 +-
 .../pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java  | 2 +-
 .../pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java | 2 +-
 .../jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java  | 2 +-
 .../jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java | 2 +-
 .../apache/jdo/tck/pc/singlefieldidentity/PartTimeEmployee.java  | 2 +-
 .../java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java   | 2 +-
 503 files changed, 509 insertions(+), 504 deletions(-)

diff --git a/LICENSE b/LICENSE
index d6456956..ff9ad453 100644
--- a/LICENSE
+++ b/LICENSE
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/NOTICE b/NOTICE
index 793e9a4a..dc3654a9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,4 +2,4 @@ Apache Java Data Objects (JDO)
 Copyright 2005-2022 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/README.md b/README.md
index 95525407..d031ce5a 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/pom.xml b/api/pom.xml
index 259834b6..bdf916a4 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -7,7 +7,7 @@
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
   
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
   
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/AttributeConverter.java b/api/src/main/java/javax/jdo/AttributeConverter.java
index 97cc2ce6..61e3dcfe 100644
--- a/api/src/main/java/javax/jdo/AttributeConverter.java
+++ b/api/src/main/java/javax/jdo/AttributeConverter.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/Constants.java b/api/src/main/java/javax/jdo/Constants.java
index 8a04a63d..18169f3b 100644
--- a/api/src/main/java/javax/jdo/Constants.java
+++ b/api/src/main/java/javax/jdo/Constants.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/Enhancer.java b/api/src/main/java/javax/jdo/Enhancer.java
index 4b8d2292..19d14ec2 100644
--- a/api/src/main/java/javax/jdo/Enhancer.java
+++ b/api/src/main/java/javax/jdo/Enhancer.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/Extent.java b/api/src/main/java/javax/jdo/Extent.java
index 9f9bd105..120200f3 100644
--- a/api/src/main/java/javax/jdo/Extent.java
+++ b/api/src/main/java/javax/jdo/Extent.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/FetchGroup.java b/api/src/main/java/javax/jdo/FetchGroup.java
index 16f546ce..ca4d2ace 100644
--- a/api/src/main/java/javax/jdo/FetchGroup.java
+++ b/api/src/main/java/javax/jdo/FetchGroup.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/FetchPlan.java b/api/src/main/java/javax/jdo/FetchPlan.java
index b480a638..85ea6722 100644
--- a/api/src/main/java/javax/jdo/FetchPlan.java
+++ b/api/src/main/java/javax/jdo/FetchPlan.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/InstanceCallbacks.java b/api/src/main/java/javax/jdo/InstanceCallbacks.java
index 0e6b6963..640e963e 100644
--- a/api/src/main/java/javax/jdo/InstanceCallbacks.java
+++ b/api/src/main/java/javax/jdo/InstanceCallbacks.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOCanRetryException.java b/api/src/main/java/javax/jdo/JDOCanRetryException.java
index 2007b85b..8296fc39 100644
--- a/api/src/main/java/javax/jdo/JDOCanRetryException.java
+++ b/api/src/main/java/javax/jdo/JDOCanRetryException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDODataStoreException.java b/api/src/main/java/javax/jdo/JDODataStoreException.java
index 15375827..4437d10a 100644
--- a/api/src/main/java/javax/jdo/JDODataStoreException.java
+++ b/api/src/main/java/javax/jdo/JDODataStoreException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java b/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
index 87d5f324..011f6cda 100644
--- a/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
+++ b/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOEnhanceException.java b/api/src/main/java/javax/jdo/JDOEnhanceException.java
index 6674da36..dc8ed535 100644
--- a/api/src/main/java/javax/jdo/JDOEnhanceException.java
+++ b/api/src/main/java/javax/jdo/JDOEnhanceException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/JDOEnhancer.java b/api/src/main/java/javax/jdo/JDOEnhancer.java
index ce21611b..08deb809 100644
--- a/api/src/main/java/javax/jdo/JDOEnhancer.java
+++ b/api/src/main/java/javax/jdo/JDOEnhancer.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/JDOException.java b/api/src/main/java/javax/jdo/JDOException.java
index dccd4dc6..18007f6c 100644
--- a/api/src/main/java/javax/jdo/JDOException.java
+++ b/api/src/main/java/javax/jdo/JDOException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java b/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
index 4107240d..538ca3e3 100644
--- a/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOFatalException.java b/api/src/main/java/javax/jdo/JDOFatalException.java
index 9885877a..6247306c 100644
--- a/api/src/main/java/javax/jdo/JDOFatalException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOFatalInternalException.java b/api/src/main/java/javax/jdo/JDOFatalInternalException.java
index 73cef35e..5ba042e5 100644
--- a/api/src/main/java/javax/jdo/JDOFatalInternalException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalInternalException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOFatalUserException.java b/api/src/main/java/javax/jdo/JDOFatalUserException.java
index 282aec03..8dc1434d 100644
--- a/api/src/main/java/javax/jdo/JDOFatalUserException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalUserException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOHelper.java b/api/src/main/java/javax/jdo/JDOHelper.java
index aa465064..892d4683 100644
--- a/api/src/main/java/javax/jdo/JDOHelper.java
+++ b/api/src/main/java/javax/jdo/JDOHelper.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDONullIdentityException.java b/api/src/main/java/javax/jdo/JDONullIdentityException.java
index cc15f0ba..4086470e 100644
--- a/api/src/main/java/javax/jdo/JDONullIdentityException.java
+++ b/api/src/main/java/javax/jdo/JDONullIdentityException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOObjectNotFoundException.java b/api/src/main/java/javax/jdo/JDOObjectNotFoundException.java
index 2b1fd13f..e6f5ec20 100644
--- a/api/src/main/java/javax/jdo/JDOObjectNotFoundException.java
+++ b/api/src/main/java/javax/jdo/JDOObjectNotFoundException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOOptimisticVerificationException.java b/api/src/main/java/javax/jdo/JDOOptimisticVerificationException.java
index 7c3e132a..11208d28 100644
--- a/api/src/main/java/javax/jdo/JDOOptimisticVerificationException.java
+++ b/api/src/main/java/javax/jdo/JDOOptimisticVerificationException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOQLTypedQuery.java b/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
index 65fbc7b4..2fd1accd 100644
--- a/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
+++ b/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java b/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
index b11b71e7..208b1ce7 100644
--- a/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
+++ b/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOQueryInterruptedException.java b/api/src/main/java/javax/jdo/JDOQueryInterruptedException.java
index a40dc5f2..7c7d7ea4 100644
--- a/api/src/main/java/javax/jdo/JDOQueryInterruptedException.java
+++ b/api/src/main/java/javax/jdo/JDOQueryInterruptedException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOReadOnlyException.java b/api/src/main/java/javax/jdo/JDOReadOnlyException.java
index b38c7378..3b178b87 100644
--- a/api/src/main/java/javax/jdo/JDOReadOnlyException.java
+++ b/api/src/main/java/javax/jdo/JDOReadOnlyException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java b/api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java
index 602a177a..13ad0ec7 100644
--- a/api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java
+++ b/api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOUserCallbackException.java b/api/src/main/java/javax/jdo/JDOUserCallbackException.java
index 3c1d653b..afb873b1 100644
--- a/api/src/main/java/javax/jdo/JDOUserCallbackException.java
+++ b/api/src/main/java/javax/jdo/JDOUserCallbackException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/JDOUserException.java b/api/src/main/java/javax/jdo/JDOUserException.java
index 99d623f2..c95b6454 100644
--- a/api/src/main/java/javax/jdo/JDOUserException.java
+++ b/api/src/main/java/javax/jdo/JDOUserException.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/LegacyJava.java b/api/src/main/java/javax/jdo/LegacyJava.java
index 5a1ddab5..70cc2e74 100644
--- a/api/src/main/java/javax/jdo/LegacyJava.java
+++ b/api/src/main/java/javax/jdo/LegacyJava.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/ObjectState.java b/api/src/main/java/javax/jdo/ObjectState.java
index 467257e9..72709dc4 100644
--- a/api/src/main/java/javax/jdo/ObjectState.java
+++ b/api/src/main/java/javax/jdo/ObjectState.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/PersistenceManager.java b/api/src/main/java/javax/jdo/PersistenceManager.java
index 4b53855b..c67c2079 100644
--- a/api/src/main/java/javax/jdo/PersistenceManager.java
+++ b/api/src/main/java/javax/jdo/PersistenceManager.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/PersistenceManagerFactory.java b/api/src/main/java/javax/jdo/PersistenceManagerFactory.java
index 410d14a5..7daa7e24 100644
--- a/api/src/main/java/javax/jdo/PersistenceManagerFactory.java
+++ b/api/src/main/java/javax/jdo/PersistenceManagerFactory.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/Query.java b/api/src/main/java/javax/jdo/Query.java
index af52d392..2d3750e6 100644
--- a/api/src/main/java/javax/jdo/Query.java
+++ b/api/src/main/java/javax/jdo/Query.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/Transaction.java b/api/src/main/java/javax/jdo/Transaction.java
index 5bd94c21..656633b0 100644
--- a/api/src/main/java/javax/jdo/Transaction.java
+++ b/api/src/main/java/javax/jdo/Transaction.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/annotations/Cacheable.java b/api/src/main/java/javax/jdo/annotations/Cacheable.java
index 2f2212ec..14128ae2 100644
--- a/api/src/main/java/javax/jdo/annotations/Cacheable.java
+++ b/api/src/main/java/javax/jdo/annotations/Cacheable.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Column.java b/api/src/main/java/javax/jdo/annotations/Column.java
index 2fc48a23..35b093d3 100644
--- a/api/src/main/java/javax/jdo/annotations/Column.java
+++ b/api/src/main/java/javax/jdo/annotations/Column.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Columns.java b/api/src/main/java/javax/jdo/annotations/Columns.java
index 54a45433..83ca0c33 100644
--- a/api/src/main/java/javax/jdo/annotations/Columns.java
+++ b/api/src/main/java/javax/jdo/annotations/Columns.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Convert.java b/api/src/main/java/javax/jdo/annotations/Convert.java
index 94e00478..4aefa001 100644
--- a/api/src/main/java/javax/jdo/annotations/Convert.java
+++ b/api/src/main/java/javax/jdo/annotations/Convert.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/DatastoreIdentity.java b/api/src/main/java/javax/jdo/annotations/DatastoreIdentity.java
index b6f78bd0..ce07a0dd 100644
--- a/api/src/main/java/javax/jdo/annotations/DatastoreIdentity.java
+++ b/api/src/main/java/javax/jdo/annotations/DatastoreIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Discriminator.java b/api/src/main/java/javax/jdo/annotations/Discriminator.java
index 1798c5c1..b2a825df 100644
--- a/api/src/main/java/javax/jdo/annotations/Discriminator.java
+++ b/api/src/main/java/javax/jdo/annotations/Discriminator.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/DiscriminatorStrategy.java b/api/src/main/java/javax/jdo/annotations/DiscriminatorStrategy.java
index 88d0ce9f..8f725fc1 100644
--- a/api/src/main/java/javax/jdo/annotations/DiscriminatorStrategy.java
+++ b/api/src/main/java/javax/jdo/annotations/DiscriminatorStrategy.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Element.java b/api/src/main/java/javax/jdo/annotations/Element.java
index 1c9d2a30..358ad6e5 100644
--- a/api/src/main/java/javax/jdo/annotations/Element.java
+++ b/api/src/main/java/javax/jdo/annotations/Element.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Embedded.java b/api/src/main/java/javax/jdo/annotations/Embedded.java
index 8449e419..ca44db1f 100644
--- a/api/src/main/java/javax/jdo/annotations/Embedded.java
+++ b/api/src/main/java/javax/jdo/annotations/Embedded.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/EmbeddedOnly.java b/api/src/main/java/javax/jdo/annotations/EmbeddedOnly.java
index 9abe4cbf..fd07d2a8 100644
--- a/api/src/main/java/javax/jdo/annotations/EmbeddedOnly.java
+++ b/api/src/main/java/javax/jdo/annotations/EmbeddedOnly.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Extension.java b/api/src/main/java/javax/jdo/annotations/Extension.java
index 5e09a88c..9511cf16 100644
--- a/api/src/main/java/javax/jdo/annotations/Extension.java
+++ b/api/src/main/java/javax/jdo/annotations/Extension.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Extensions.java b/api/src/main/java/javax/jdo/annotations/Extensions.java
index 6c67f597..6ba6bfc4 100644
--- a/api/src/main/java/javax/jdo/annotations/Extensions.java
+++ b/api/src/main/java/javax/jdo/annotations/Extensions.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/FetchGroup.java b/api/src/main/java/javax/jdo/annotations/FetchGroup.java
index 11758dc4..f7ae432f 100644
--- a/api/src/main/java/javax/jdo/annotations/FetchGroup.java
+++ b/api/src/main/java/javax/jdo/annotations/FetchGroup.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/FetchGroups.java b/api/src/main/java/javax/jdo/annotations/FetchGroups.java
index a77105b0..cd55704b 100644
--- a/api/src/main/java/javax/jdo/annotations/FetchGroups.java
+++ b/api/src/main/java/javax/jdo/annotations/FetchGroups.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/FetchPlan.java b/api/src/main/java/javax/jdo/annotations/FetchPlan.java
index 5f79f94b..8e46e55a 100644
--- a/api/src/main/java/javax/jdo/annotations/FetchPlan.java
+++ b/api/src/main/java/javax/jdo/annotations/FetchPlan.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/FetchPlans.java b/api/src/main/java/javax/jdo/annotations/FetchPlans.java
index 342b410e..196a156c 100644
--- a/api/src/main/java/javax/jdo/annotations/FetchPlans.java
+++ b/api/src/main/java/javax/jdo/annotations/FetchPlans.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/ForeignKey.java b/api/src/main/java/javax/jdo/annotations/ForeignKey.java
index eb76e288..62419ec4 100644
--- a/api/src/main/java/javax/jdo/annotations/ForeignKey.java
+++ b/api/src/main/java/javax/jdo/annotations/ForeignKey.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/ForeignKeyAction.java b/api/src/main/java/javax/jdo/annotations/ForeignKeyAction.java
index 2f686946..d84daa15 100644
--- a/api/src/main/java/javax/jdo/annotations/ForeignKeyAction.java
+++ b/api/src/main/java/javax/jdo/annotations/ForeignKeyAction.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/ForeignKeys.java b/api/src/main/java/javax/jdo/annotations/ForeignKeys.java
index 10da6bd6..e0cd58b1 100644
--- a/api/src/main/java/javax/jdo/annotations/ForeignKeys.java
+++ b/api/src/main/java/javax/jdo/annotations/ForeignKeys.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/IdGeneratorStrategy.java b/api/src/main/java/javax/jdo/annotations/IdGeneratorStrategy.java
index f80800e5..f00f9f4f 100644
--- a/api/src/main/java/javax/jdo/annotations/IdGeneratorStrategy.java
+++ b/api/src/main/java/javax/jdo/annotations/IdGeneratorStrategy.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/IdentityType.java b/api/src/main/java/javax/jdo/annotations/IdentityType.java
index a674e523..3d391dda 100644
--- a/api/src/main/java/javax/jdo/annotations/IdentityType.java
+++ b/api/src/main/java/javax/jdo/annotations/IdentityType.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Index.java b/api/src/main/java/javax/jdo/annotations/Index.java
index fd83a022..43ce1af6 100644
--- a/api/src/main/java/javax/jdo/annotations/Index.java
+++ b/api/src/main/java/javax/jdo/annotations/Index.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Indices.java b/api/src/main/java/javax/jdo/annotations/Indices.java
index d455fde4..bd229037 100644
--- a/api/src/main/java/javax/jdo/annotations/Indices.java
+++ b/api/src/main/java/javax/jdo/annotations/Indices.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Inheritance.java b/api/src/main/java/javax/jdo/annotations/Inheritance.java
index 92389a71..03e07ca1 100644
--- a/api/src/main/java/javax/jdo/annotations/Inheritance.java
+++ b/api/src/main/java/javax/jdo/annotations/Inheritance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/InheritanceStrategy.java b/api/src/main/java/javax/jdo/annotations/InheritanceStrategy.java
index ed77e989..f9b028a6 100644
--- a/api/src/main/java/javax/jdo/annotations/InheritanceStrategy.java
+++ b/api/src/main/java/javax/jdo/annotations/InheritanceStrategy.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Join.java b/api/src/main/java/javax/jdo/annotations/Join.java
index 1d0939bb..e1267521 100644
--- a/api/src/main/java/javax/jdo/annotations/Join.java
+++ b/api/src/main/java/javax/jdo/annotations/Join.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Joins.java b/api/src/main/java/javax/jdo/annotations/Joins.java
index 650923a1..41eb039a 100644
--- a/api/src/main/java/javax/jdo/annotations/Joins.java
+++ b/api/src/main/java/javax/jdo/annotations/Joins.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Key.java b/api/src/main/java/javax/jdo/annotations/Key.java
index 2af27b87..e9c76e6f 100644
--- a/api/src/main/java/javax/jdo/annotations/Key.java
+++ b/api/src/main/java/javax/jdo/annotations/Key.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/NotPersistent.java b/api/src/main/java/javax/jdo/annotations/NotPersistent.java
index 1a015422..299148d7 100644
--- a/api/src/main/java/javax/jdo/annotations/NotPersistent.java
+++ b/api/src/main/java/javax/jdo/annotations/NotPersistent.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/NullValue.java b/api/src/main/java/javax/jdo/annotations/NullValue.java
index a53e3bda..896520ce 100644
--- a/api/src/main/java/javax/jdo/annotations/NullValue.java
+++ b/api/src/main/java/javax/jdo/annotations/NullValue.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Order.java b/api/src/main/java/javax/jdo/annotations/Order.java
index 41e2dede..3d76e451 100644
--- a/api/src/main/java/javax/jdo/annotations/Order.java
+++ b/api/src/main/java/javax/jdo/annotations/Order.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/PersistenceAware.java b/api/src/main/java/javax/jdo/annotations/PersistenceAware.java
index d615999a..1692dcee 100644
--- a/api/src/main/java/javax/jdo/annotations/PersistenceAware.java
+++ b/api/src/main/java/javax/jdo/annotations/PersistenceAware.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/PersistenceCapable.java b/api/src/main/java/javax/jdo/annotations/PersistenceCapable.java
index 3cdf7e7d..f7c438ed 100644
--- a/api/src/main/java/javax/jdo/annotations/PersistenceCapable.java
+++ b/api/src/main/java/javax/jdo/annotations/PersistenceCapable.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/PersistenceModifier.java b/api/src/main/java/javax/jdo/annotations/PersistenceModifier.java
index 632e1b9b..04616e93 100644
--- a/api/src/main/java/javax/jdo/annotations/PersistenceModifier.java
+++ b/api/src/main/java/javax/jdo/annotations/PersistenceModifier.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Persistent.java b/api/src/main/java/javax/jdo/annotations/Persistent.java
index 70b975b2..46e24690 100644
--- a/api/src/main/java/javax/jdo/annotations/Persistent.java
+++ b/api/src/main/java/javax/jdo/annotations/Persistent.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/PrimaryKey.java b/api/src/main/java/javax/jdo/annotations/PrimaryKey.java
index 87ee59b6..d866ef0b 100644
--- a/api/src/main/java/javax/jdo/annotations/PrimaryKey.java
+++ b/api/src/main/java/javax/jdo/annotations/PrimaryKey.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Queries.java b/api/src/main/java/javax/jdo/annotations/Queries.java
index ea52d103..b96efdde 100644
--- a/api/src/main/java/javax/jdo/annotations/Queries.java
+++ b/api/src/main/java/javax/jdo/annotations/Queries.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Query.java b/api/src/main/java/javax/jdo/annotations/Query.java
index 27f4af16..c5c652c9 100644
--- a/api/src/main/java/javax/jdo/annotations/Query.java
+++ b/api/src/main/java/javax/jdo/annotations/Query.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Sequence.java b/api/src/main/java/javax/jdo/annotations/Sequence.java
index c706e61d..94544348 100644
--- a/api/src/main/java/javax/jdo/annotations/Sequence.java
+++ b/api/src/main/java/javax/jdo/annotations/Sequence.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/SequenceStrategy.java b/api/src/main/java/javax/jdo/annotations/SequenceStrategy.java
index cb9a9160..a5b9ae13 100644
--- a/api/src/main/java/javax/jdo/annotations/SequenceStrategy.java
+++ b/api/src/main/java/javax/jdo/annotations/SequenceStrategy.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Serialized.java b/api/src/main/java/javax/jdo/annotations/Serialized.java
index be28a1be..912519cb 100644
--- a/api/src/main/java/javax/jdo/annotations/Serialized.java
+++ b/api/src/main/java/javax/jdo/annotations/Serialized.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Transactional.java b/api/src/main/java/javax/jdo/annotations/Transactional.java
index 60b10792..f045937f 100644
--- a/api/src/main/java/javax/jdo/annotations/Transactional.java
+++ b/api/src/main/java/javax/jdo/annotations/Transactional.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Unique.java b/api/src/main/java/javax/jdo/annotations/Unique.java
index c64cb5bc..2dbbf84f 100644
--- a/api/src/main/java/javax/jdo/annotations/Unique.java
+++ b/api/src/main/java/javax/jdo/annotations/Unique.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Uniques.java b/api/src/main/java/javax/jdo/annotations/Uniques.java
index 548a2943..36ba2a28 100644
--- a/api/src/main/java/javax/jdo/annotations/Uniques.java
+++ b/api/src/main/java/javax/jdo/annotations/Uniques.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Value.java b/api/src/main/java/javax/jdo/annotations/Value.java
index c56da16d..f62884b5 100644
--- a/api/src/main/java/javax/jdo/annotations/Value.java
+++ b/api/src/main/java/javax/jdo/annotations/Value.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/Version.java b/api/src/main/java/javax/jdo/annotations/Version.java
index 12105f10..894b4c13 100644
--- a/api/src/main/java/javax/jdo/annotations/Version.java
+++ b/api/src/main/java/javax/jdo/annotations/Version.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/annotations/VersionStrategy.java b/api/src/main/java/javax/jdo/annotations/VersionStrategy.java
index 2f024f6b..41f1dc39 100644
--- a/api/src/main/java/javax/jdo/annotations/VersionStrategy.java
+++ b/api/src/main/java/javax/jdo/annotations/VersionStrategy.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/datastore/DataStoreCache.java b/api/src/main/java/javax/jdo/datastore/DataStoreCache.java
index d901174e..e2a2fc00 100644
--- a/api/src/main/java/javax/jdo/datastore/DataStoreCache.java
+++ b/api/src/main/java/javax/jdo/datastore/DataStoreCache.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/datastore/JDOConnection.java b/api/src/main/java/javax/jdo/datastore/JDOConnection.java
index 27126a60..d1b01671 100644
--- a/api/src/main/java/javax/jdo/datastore/JDOConnection.java
+++ b/api/src/main/java/javax/jdo/datastore/JDOConnection.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/datastore/Sequence.java b/api/src/main/java/javax/jdo/datastore/Sequence.java
index b004d499..c1ecd232 100644
--- a/api/src/main/java/javax/jdo/datastore/Sequence.java
+++ b/api/src/main/java/javax/jdo/datastore/Sequence.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/datastore/package.html b/api/src/main/java/javax/jdo/datastore/package.html
index 29ed77cd..c388f50d 100644
--- a/api/src/main/java/javax/jdo/datastore/package.html
+++ b/api/src/main/java/javax/jdo/datastore/package.html
@@ -6,7 +6,7 @@
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at
  
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software 
  distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/ByteIdentity.java b/api/src/main/java/javax/jdo/identity/ByteIdentity.java
index 171cf364..d56a0926 100644
--- a/api/src/main/java/javax/jdo/identity/ByteIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/ByteIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/CharIdentity.java b/api/src/main/java/javax/jdo/identity/CharIdentity.java
index 489d2c91..7cf03bb6 100644
--- a/api/src/main/java/javax/jdo/identity/CharIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/CharIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/IntIdentity.java b/api/src/main/java/javax/jdo/identity/IntIdentity.java
index ccb67bed..e2159409 100644
--- a/api/src/main/java/javax/jdo/identity/IntIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/IntIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/LongIdentity.java b/api/src/main/java/javax/jdo/identity/LongIdentity.java
index 1ddbbc65..b522751b 100644
--- a/api/src/main/java/javax/jdo/identity/LongIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/LongIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/ObjectIdentity.java b/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
index 751d2200..6cace865 100644
--- a/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/ShortIdentity.java b/api/src/main/java/javax/jdo/identity/ShortIdentity.java
index 6481a234..c7dee68e 100644
--- a/api/src/main/java/javax/jdo/identity/ShortIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/ShortIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java b/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
index 041a9335..4a1dda64 100644
--- a/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/StringIdentity.java b/api/src/main/java/javax/jdo/identity/StringIdentity.java
index 0802ab20..80f0ac20 100644
--- a/api/src/main/java/javax/jdo/identity/StringIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/StringIdentity.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/identity/package.html b/api/src/main/java/javax/jdo/identity/package.html
index 295fca4a..bbb94909 100644
--- a/api/src/main/java/javax/jdo/identity/package.html
+++ b/api/src/main/java/javax/jdo/identity/package.html
@@ -6,7 +6,7 @@
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at
  
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software 
  distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/AttachCallback.java b/api/src/main/java/javax/jdo/listener/AttachCallback.java
index d781977d..140d2af0 100644
--- a/api/src/main/java/javax/jdo/listener/AttachCallback.java
+++ b/api/src/main/java/javax/jdo/listener/AttachCallback.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/AttachLifecycleListener.java b/api/src/main/java/javax/jdo/listener/AttachLifecycleListener.java
index a292ad95..15ba883a 100644
--- a/api/src/main/java/javax/jdo/listener/AttachLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/AttachLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/ClearCallback.java b/api/src/main/java/javax/jdo/listener/ClearCallback.java
index 45cfac0f..f9a2956e 100644
--- a/api/src/main/java/javax/jdo/listener/ClearCallback.java
+++ b/api/src/main/java/javax/jdo/listener/ClearCallback.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java b/api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java
index 08d04026..174d4f4b 100644
--- a/api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/CreateLifecycleListener.java b/api/src/main/java/javax/jdo/listener/CreateLifecycleListener.java
index e8e30504..2480cc4d 100644
--- a/api/src/main/java/javax/jdo/listener/CreateLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/CreateLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/DeleteCallback.java b/api/src/main/java/javax/jdo/listener/DeleteCallback.java
index d08d72a5..7d78064f 100644
--- a/api/src/main/java/javax/jdo/listener/DeleteCallback.java
+++ b/api/src/main/java/javax/jdo/listener/DeleteCallback.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/DeleteLifecycleListener.java b/api/src/main/java/javax/jdo/listener/DeleteLifecycleListener.java
index 4932df2a..444ce3ee 100644
--- a/api/src/main/java/javax/jdo/listener/DeleteLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/DeleteLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/DetachCallback.java b/api/src/main/java/javax/jdo/listener/DetachCallback.java
index f022f8e2..0c740469 100644
--- a/api/src/main/java/javax/jdo/listener/DetachCallback.java
+++ b/api/src/main/java/javax/jdo/listener/DetachCallback.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/DetachLifecycleListener.java b/api/src/main/java/javax/jdo/listener/DetachLifecycleListener.java
index 023ce8a5..90645ede 100644
--- a/api/src/main/java/javax/jdo/listener/DetachLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/DetachLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java b/api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java
index 45217645..240d28e1 100644
--- a/api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java b/api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java
index ee9437e0..fabfdbee 100644
--- a/api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java
+++ b/api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/InstanceLifecycleListener.java b/api/src/main/java/javax/jdo/listener/InstanceLifecycleListener.java
index 9783cbb2..20c9a2b9 100644
--- a/api/src/main/java/javax/jdo/listener/InstanceLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/InstanceLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/LoadCallback.java b/api/src/main/java/javax/jdo/listener/LoadCallback.java
index 2ece8952..3526c060 100644
--- a/api/src/main/java/javax/jdo/listener/LoadCallback.java
+++ b/api/src/main/java/javax/jdo/listener/LoadCallback.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java b/api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java
index 06525dc8..790992e9 100644
--- a/api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/StoreCallback.java b/api/src/main/java/javax/jdo/listener/StoreCallback.java
index a895980d..e977257c 100644
--- a/api/src/main/java/javax/jdo/listener/StoreCallback.java
+++ b/api/src/main/java/javax/jdo/listener/StoreCallback.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java b/api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java
index 5713e487..01f28f89 100644
--- a/api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/listener/package.html b/api/src/main/java/javax/jdo/listener/package.html
index 446f7630..6337a2d3 100644
--- a/api/src/main/java/javax/jdo/listener/package.html
+++ b/api/src/main/java/javax/jdo/listener/package.html
@@ -6,7 +6,7 @@
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at
  
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software 
  distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/metadata/ArrayMetadata.java b/api/src/main/java/javax/jdo/metadata/ArrayMetadata.java
index 6359c4ed..de81897b 100644
--- a/api/src/main/java/javax/jdo/metadata/ArrayMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/ArrayMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/ClassMetadata.java b/api/src/main/java/javax/jdo/metadata/ClassMetadata.java
index 37ff5fb9..dfe59f5c 100644
--- a/api/src/main/java/javax/jdo/metadata/ClassMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/ClassMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/ClassPersistenceModifier.java b/api/src/main/java/javax/jdo/metadata/ClassPersistenceModifier.java
index 5c01bab8..e8af23c8 100644
--- a/api/src/main/java/javax/jdo/metadata/ClassPersistenceModifier.java
+++ b/api/src/main/java/javax/jdo/metadata/ClassPersistenceModifier.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/CollectionMetadata.java b/api/src/main/java/javax/jdo/metadata/CollectionMetadata.java
index 82033454..f854f090 100644
--- a/api/src/main/java/javax/jdo/metadata/CollectionMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/CollectionMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/ColumnMetadata.java b/api/src/main/java/javax/jdo/metadata/ColumnMetadata.java
index e2cee52a..a1091934 100644
--- a/api/src/main/java/javax/jdo/metadata/ColumnMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/ColumnMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/DatastoreIdentityMetadata.java b/api/src/main/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
index 785cd482..f2d33165 100644
--- a/api/src/main/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/DiscriminatorMetadata.java b/api/src/main/java/javax/jdo/metadata/DiscriminatorMetadata.java
index 32fd16c9..88d57fd0 100644
--- a/api/src/main/java/javax/jdo/metadata/DiscriminatorMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/DiscriminatorMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/ElementMetadata.java b/api/src/main/java/javax/jdo/metadata/ElementMetadata.java
index 447d6eaa..b7772969 100644
--- a/api/src/main/java/javax/jdo/metadata/ElementMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/ElementMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/EmbeddedMetadata.java b/api/src/main/java/javax/jdo/metadata/EmbeddedMetadata.java
index 2e60f9db..6315b967 100644
--- a/api/src/main/java/javax/jdo/metadata/EmbeddedMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/EmbeddedMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/ExtensionMetadata.java b/api/src/main/java/javax/jdo/metadata/ExtensionMetadata.java
index e7e325ba..1c5d5726 100644
--- a/api/src/main/java/javax/jdo/metadata/ExtensionMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/ExtensionMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/FetchGroupMetadata.java b/api/src/main/java/javax/jdo/metadata/FetchGroupMetadata.java
index 46a96428..82907bc1 100644
--- a/api/src/main/java/javax/jdo/metadata/FetchGroupMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/FetchGroupMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/FetchPlanMetadata.java b/api/src/main/java/javax/jdo/metadata/FetchPlanMetadata.java
index 62024e58..bcfc9d75 100644
--- a/api/src/main/java/javax/jdo/metadata/FetchPlanMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/FetchPlanMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/FieldMetadata.java b/api/src/main/java/javax/jdo/metadata/FieldMetadata.java
index c5177968..40220fce 100644
--- a/api/src/main/java/javax/jdo/metadata/FieldMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/FieldMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/ForeignKeyMetadata.java b/api/src/main/java/javax/jdo/metadata/ForeignKeyMetadata.java
index 51efc8e0..f142950a 100644
--- a/api/src/main/java/javax/jdo/metadata/ForeignKeyMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/ForeignKeyMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/IndexMetadata.java b/api/src/main/java/javax/jdo/metadata/IndexMetadata.java
index 086ba18e..a8578bac 100644
--- a/api/src/main/java/javax/jdo/metadata/IndexMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/IndexMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/Indexed.java b/api/src/main/java/javax/jdo/metadata/Indexed.java
index 86d776ab..f7b2b997 100644
--- a/api/src/main/java/javax/jdo/metadata/Indexed.java
+++ b/api/src/main/java/javax/jdo/metadata/Indexed.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/InheritanceMetadata.java b/api/src/main/java/javax/jdo/metadata/InheritanceMetadata.java
index 7762c6f3..1d888bae 100644
--- a/api/src/main/java/javax/jdo/metadata/InheritanceMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/InheritanceMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/InterfaceMetadata.java b/api/src/main/java/javax/jdo/metadata/InterfaceMetadata.java
index 82fc82fc..b7ab60e8 100644
--- a/api/src/main/java/javax/jdo/metadata/InterfaceMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/InterfaceMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/JDOMetadata.java b/api/src/main/java/javax/jdo/metadata/JDOMetadata.java
index ab6fb6d8..5c2a2a44 100644
--- a/api/src/main/java/javax/jdo/metadata/JDOMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/JDOMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/JoinMetadata.java b/api/src/main/java/javax/jdo/metadata/JoinMetadata.java
index 363f483a..a2fe1626 100644
--- a/api/src/main/java/javax/jdo/metadata/JoinMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/JoinMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/KeyMetadata.java b/api/src/main/java/javax/jdo/metadata/KeyMetadata.java
index e4d0175f..25ad2f9b 100644
--- a/api/src/main/java/javax/jdo/metadata/KeyMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/KeyMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/MapMetadata.java b/api/src/main/java/javax/jdo/metadata/MapMetadata.java
index f6ae0b3f..e1dcbd51 100644
--- a/api/src/main/java/javax/jdo/metadata/MapMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/MapMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/MemberMetadata.java b/api/src/main/java/javax/jdo/metadata/MemberMetadata.java
index fb5a9f8c..3a90feb7 100644
--- a/api/src/main/java/javax/jdo/metadata/MemberMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/MemberMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/Metadata.java b/api/src/main/java/javax/jdo/metadata/Metadata.java
index cd1f1163..d91e984f 100644
--- a/api/src/main/java/javax/jdo/metadata/Metadata.java
+++ b/api/src/main/java/javax/jdo/metadata/Metadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/OrderMetadata.java b/api/src/main/java/javax/jdo/metadata/OrderMetadata.java
index 22ad8daa..005232d3 100644
--- a/api/src/main/java/javax/jdo/metadata/OrderMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/OrderMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/PackageMetadata.java b/api/src/main/java/javax/jdo/metadata/PackageMetadata.java
index 980472b7..67aff313 100644
--- a/api/src/main/java/javax/jdo/metadata/PackageMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/PackageMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/PrimaryKeyMetadata.java b/api/src/main/java/javax/jdo/metadata/PrimaryKeyMetadata.java
index 10a2f3e8..c592a387 100644
--- a/api/src/main/java/javax/jdo/metadata/PrimaryKeyMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/PrimaryKeyMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/PropertyMetadata.java b/api/src/main/java/javax/jdo/metadata/PropertyMetadata.java
index 7a44d2c0..faae8bc9 100644
--- a/api/src/main/java/javax/jdo/metadata/PropertyMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/PropertyMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/QueryMetadata.java b/api/src/main/java/javax/jdo/metadata/QueryMetadata.java
index 31075b82..58f5d1ad 100644
--- a/api/src/main/java/javax/jdo/metadata/QueryMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/QueryMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/SequenceMetadata.java b/api/src/main/java/javax/jdo/metadata/SequenceMetadata.java
index d4a94587..97be9c4f 100644
--- a/api/src/main/java/javax/jdo/metadata/SequenceMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/SequenceMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/TypeMetadata.java b/api/src/main/java/javax/jdo/metadata/TypeMetadata.java
index 6f6639c3..1ed1d791 100644
--- a/api/src/main/java/javax/jdo/metadata/TypeMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/TypeMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/UniqueMetadata.java b/api/src/main/java/javax/jdo/metadata/UniqueMetadata.java
index 07b849ed..f82f32d4 100644
--- a/api/src/main/java/javax/jdo/metadata/UniqueMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/UniqueMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/ValueMetadata.java b/api/src/main/java/javax/jdo/metadata/ValueMetadata.java
index ee63eeb9..51bcdee1 100644
--- a/api/src/main/java/javax/jdo/metadata/ValueMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/ValueMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/VersionMetadata.java b/api/src/main/java/javax/jdo/metadata/VersionMetadata.java
index 670dc17a..38ae453f 100644
--- a/api/src/main/java/javax/jdo/metadata/VersionMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/VersionMetadata.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/metadata/package.html b/api/src/main/java/javax/jdo/metadata/package.html
index 0fb0b85a..db48c73b 100644
--- a/api/src/main/java/javax/jdo/metadata/package.html
+++ b/api/src/main/java/javax/jdo/metadata/package.html
@@ -6,7 +6,7 @@
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at
  
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software 
  distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/package.html b/api/src/main/java/javax/jdo/package.html
index f5693c53..9c6681b2 100644
--- a/api/src/main/java/javax/jdo/package.html
+++ b/api/src/main/java/javax/jdo/package.html
@@ -6,7 +6,7 @@
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at
  
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software 
  distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/BooleanExpression.java b/api/src/main/java/javax/jdo/query/BooleanExpression.java
index be0cb199..400b4b81 100644
--- a/api/src/main/java/javax/jdo/query/BooleanExpression.java
+++ b/api/src/main/java/javax/jdo/query/BooleanExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/ByteExpression.java b/api/src/main/java/javax/jdo/query/ByteExpression.java
index 9ff1ed77..84a9b536 100644
--- a/api/src/main/java/javax/jdo/query/ByteExpression.java
+++ b/api/src/main/java/javax/jdo/query/ByteExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/CharacterExpression.java b/api/src/main/java/javax/jdo/query/CharacterExpression.java
index c9b5b4b5..080b9a77 100644
--- a/api/src/main/java/javax/jdo/query/CharacterExpression.java
+++ b/api/src/main/java/javax/jdo/query/CharacterExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/CollectionExpression.java b/api/src/main/java/javax/jdo/query/CollectionExpression.java
index c5d2c6f8..af10d2fc 100644
--- a/api/src/main/java/javax/jdo/query/CollectionExpression.java
+++ b/api/src/main/java/javax/jdo/query/CollectionExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/ComparableExpression.java b/api/src/main/java/javax/jdo/query/ComparableExpression.java
index 98b93df0..7ac4a33b 100644
--- a/api/src/main/java/javax/jdo/query/ComparableExpression.java
+++ b/api/src/main/java/javax/jdo/query/ComparableExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/DateExpression.java b/api/src/main/java/javax/jdo/query/DateExpression.java
index a361a79b..dfb0be00 100644
--- a/api/src/main/java/javax/jdo/query/DateExpression.java
+++ b/api/src/main/java/javax/jdo/query/DateExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/DateTimeExpression.java b/api/src/main/java/javax/jdo/query/DateTimeExpression.java
index ab005ee0..fd0b273d 100644
--- a/api/src/main/java/javax/jdo/query/DateTimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/DateTimeExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/EnumExpression.java b/api/src/main/java/javax/jdo/query/EnumExpression.java
index 065295f3..68e48b88 100644
--- a/api/src/main/java/javax/jdo/query/EnumExpression.java
+++ b/api/src/main/java/javax/jdo/query/EnumExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/Expression.java b/api/src/main/java/javax/jdo/query/Expression.java
index 7133b299..b304c8f5 100644
--- a/api/src/main/java/javax/jdo/query/Expression.java
+++ b/api/src/main/java/javax/jdo/query/Expression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/IfThenElseExpression.java b/api/src/main/java/javax/jdo/query/IfThenElseExpression.java
index aa2f0d6b..c014b6cc 100644
--- a/api/src/main/java/javax/jdo/query/IfThenElseExpression.java
+++ b/api/src/main/java/javax/jdo/query/IfThenElseExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/java/javax/jdo/query/ListExpression.java b/api/src/main/java/javax/jdo/query/ListExpression.java
index 69a750ce..d6b422fc 100644
--- a/api/src/main/java/javax/jdo/query/ListExpression.java
+++ b/api/src/main/java/javax/jdo/query/ListExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/LocalDateExpression.java b/api/src/main/java/javax/jdo/query/LocalDateExpression.java
index 30b58c23..6df74164 100644
--- a/api/src/main/java/javax/jdo/query/LocalDateExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalDateExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java b/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
index ffd3bc0a..ea553cf2 100644
--- a/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/LocalTimeExpression.java b/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
index ef5cc2e9..8ce93e20 100644
--- a/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/MapExpression.java b/api/src/main/java/javax/jdo/query/MapExpression.java
index d31b20a4..13b48668 100644
--- a/api/src/main/java/javax/jdo/query/MapExpression.java
+++ b/api/src/main/java/javax/jdo/query/MapExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/NumericExpression.java b/api/src/main/java/javax/jdo/query/NumericExpression.java
index f7803f97..c509f085 100644
--- a/api/src/main/java/javax/jdo/query/NumericExpression.java
+++ b/api/src/main/java/javax/jdo/query/NumericExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/ObjectExpression.java b/api/src/main/java/javax/jdo/query/ObjectExpression.java
index 01feb74e..2b026054 100644
--- a/api/src/main/java/javax/jdo/query/ObjectExpression.java
+++ b/api/src/main/java/javax/jdo/query/ObjectExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/OptionalExpression.java b/api/src/main/java/javax/jdo/query/OptionalExpression.java
index c96db065..b38b9502 100644
--- a/api/src/main/java/javax/jdo/query/OptionalExpression.java
+++ b/api/src/main/java/javax/jdo/query/OptionalExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/OrderExpression.java b/api/src/main/java/javax/jdo/query/OrderExpression.java
index 704103eb..0ff15e8a 100644
--- a/api/src/main/java/javax/jdo/query/OrderExpression.java
+++ b/api/src/main/java/javax/jdo/query/OrderExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/PersistableExpression.java b/api/src/main/java/javax/jdo/query/PersistableExpression.java
index 83c1fa07..6b355e3b 100644
--- a/api/src/main/java/javax/jdo/query/PersistableExpression.java
+++ b/api/src/main/java/javax/jdo/query/PersistableExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/StringExpression.java b/api/src/main/java/javax/jdo/query/StringExpression.java
index 6d98e8b5..3ceacd21 100644
--- a/api/src/main/java/javax/jdo/query/StringExpression.java
+++ b/api/src/main/java/javax/jdo/query/StringExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/SubqueryExpression.java b/api/src/main/java/javax/jdo/query/SubqueryExpression.java
index bb4f4d77..11ba6df0 100644
--- a/api/src/main/java/javax/jdo/query/SubqueryExpression.java
+++ b/api/src/main/java/javax/jdo/query/SubqueryExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/TimeExpression.java b/api/src/main/java/javax/jdo/query/TimeExpression.java
index f32a07e1..283b4454 100644
--- a/api/src/main/java/javax/jdo/query/TimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/TimeExpression.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/query/package.html b/api/src/main/java/javax/jdo/query/package.html
index c65e849a..bce80feb 100644
--- a/api/src/main/java/javax/jdo/query/package.html
+++ b/api/src/main/java/javax/jdo/query/package.html
@@ -6,7 +6,7 @@
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at
  
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software 
  distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/Detachable.java b/api/src/main/java/javax/jdo/spi/Detachable.java
index b3c5f1ba..e320473d 100644
--- a/api/src/main/java/javax/jdo/spi/Detachable.java
+++ b/api/src/main/java/javax/jdo/spi/Detachable.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/I18NHelper.java b/api/src/main/java/javax/jdo/spi/I18NHelper.java
index 4e3abaae..331a7b12 100644
--- a/api/src/main/java/javax/jdo/spi/I18NHelper.java
+++ b/api/src/main/java/javax/jdo/spi/I18NHelper.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/JDOImplHelper.java b/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
index 4436161a..99bc1644 100644
--- a/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
+++ b/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/JDOPermission.java b/api/src/main/java/javax/jdo/spi/JDOPermission.java
index 4dee7ba7..c1e60a09 100644
--- a/api/src/main/java/javax/jdo/spi/JDOPermission.java
+++ b/api/src/main/java/javax/jdo/spi/JDOPermission.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/PersistenceCapable.java b/api/src/main/java/javax/jdo/spi/PersistenceCapable.java
index d85fc899..dd03a9c9 100644
--- a/api/src/main/java/javax/jdo/spi/PersistenceCapable.java
+++ b/api/src/main/java/javax/jdo/spi/PersistenceCapable.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/RegisterClassEvent.java b/api/src/main/java/javax/jdo/spi/RegisterClassEvent.java
index 31106d01..3f477798 100644
--- a/api/src/main/java/javax/jdo/spi/RegisterClassEvent.java
+++ b/api/src/main/java/javax/jdo/spi/RegisterClassEvent.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/RegisterClassListener.java b/api/src/main/java/javax/jdo/spi/RegisterClassListener.java
index 7aec07fa..0fdc61b5 100644
--- a/api/src/main/java/javax/jdo/spi/RegisterClassListener.java
+++ b/api/src/main/java/javax/jdo/spi/RegisterClassListener.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/StateInterrogation.java b/api/src/main/java/javax/jdo/spi/StateInterrogation.java
index 56742427..8e3bdfd4 100644
--- a/api/src/main/java/javax/jdo/spi/StateInterrogation.java
+++ b/api/src/main/java/javax/jdo/spi/StateInterrogation.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/StateManager.java b/api/src/main/java/javax/jdo/spi/StateManager.java
index 46ab1efa..209a14ee 100644
--- a/api/src/main/java/javax/jdo/spi/StateManager.java
+++ b/api/src/main/java/javax/jdo/spi/StateManager.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/java/javax/jdo/spi/package.html b/api/src/main/java/javax/jdo/spi/package.html
index 94a53201..e7622f2f 100644
--- a/api/src/main/java/javax/jdo/spi/package.html
+++ b/api/src/main/java/javax/jdo/spi/package.html
@@ -6,7 +6,7 @@
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at
  
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software 
  distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/resources/javax/jdo/Bundle.properties b/api/src/main/resources/javax/jdo/Bundle.properties
index eba7e31a..208ef456 100644
--- a/api/src/main/resources/javax/jdo/Bundle.properties
+++ b/api/src/main/resources/javax/jdo/Bundle.properties
@@ -6,7 +6,7 @@
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
 # 
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 # 
 # Unless required by applicable law or agreed to in writing, software 
 # distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/api/src/main/resources/javax/jdo/jdo_2_0.dtd b/api/src/main/resources/javax/jdo/jdo_2_0.dtd
index 3b8a6b8b..f3ebb21d 100644
--- a/api/src/main/resources/javax/jdo/jdo_2_0.dtd
+++ b/api/src/main/resources/javax/jdo/jdo_2_0.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_2_0.xsd b/api/src/main/resources/javax/jdo/jdo_2_0.xsd
index 48ebce78..4c1e5ef9 100644
--- a/api/src/main/resources/javax/jdo/jdo_2_0.xsd
+++ b/api/src/main/resources/javax/jdo/jdo_2_0.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_2_1.xsd b/api/src/main/resources/javax/jdo/jdo_2_1.xsd
index e2e3b678..b73d0274 100644
--- a/api/src/main/resources/javax/jdo/jdo_2_1.xsd
+++ b/api/src/main/resources/javax/jdo/jdo_2_1.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_2_2.dtd b/api/src/main/resources/javax/jdo/jdo_2_2.dtd
index c9a80464..e60fb338 100644
--- a/api/src/main/resources/javax/jdo/jdo_2_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdo_2_2.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_2_2.xsd b/api/src/main/resources/javax/jdo/jdo_2_2.xsd
index 30d32586..9779dd85 100644
--- a/api/src/main/resources/javax/jdo/jdo_2_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdo_2_2.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_3_0.dtd b/api/src/main/resources/javax/jdo/jdo_3_0.dtd
index b9d2d62d..d6b5a7d4 100644
--- a/api/src/main/resources/javax/jdo/jdo_3_0.dtd
+++ b/api/src/main/resources/javax/jdo/jdo_3_0.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_3_0.xsd b/api/src/main/resources/javax/jdo/jdo_3_0.xsd
index 9970c8fd..5dc83204 100644
--- a/api/src/main/resources/javax/jdo/jdo_3_0.xsd
+++ b/api/src/main/resources/javax/jdo/jdo_3_0.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_3_1.dtd b/api/src/main/resources/javax/jdo/jdo_3_1.dtd
index 73062f62..3e9e2910 100644
--- a/api/src/main/resources/javax/jdo/jdo_3_1.dtd
+++ b/api/src/main/resources/javax/jdo/jdo_3_1.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_3_1.xsd b/api/src/main/resources/javax/jdo/jdo_3_1.xsd
index 29806a44..d238fedf 100644
--- a/api/src/main/resources/javax/jdo/jdo_3_1.xsd
+++ b/api/src/main/resources/javax/jdo/jdo_3_1.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_3_2.dtd b/api/src/main/resources/javax/jdo/jdo_3_2.dtd
index 9ab60418..54f11ee3 100755
--- a/api/src/main/resources/javax/jdo/jdo_3_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdo_3_2.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdo_3_2.xsd b/api/src/main/resources/javax/jdo/jdo_3_2.xsd
index 9fff4a27..95641c82 100755
--- a/api/src/main/resources/javax/jdo/jdo_3_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdo_3_2.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_2_1.dtd b/api/src/main/resources/javax/jdo/jdoconfig_2_1.dtd
index d6ecad50..7a1743d7 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_2_1.dtd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_2_1.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_2_1.xsd b/api/src/main/resources/javax/jdo/jdoconfig_2_1.xsd
index 80e103a6..5ea2b99d 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_2_1.xsd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_2_1.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_2_2.dtd b/api/src/main/resources/javax/jdo/jdoconfig_2_2.dtd
index 9c0a3e90..04666988 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_2_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_2_2.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_2_2.xsd b/api/src/main/resources/javax/jdo/jdoconfig_2_2.xsd
index 99beb31d..bd2e10a6 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_2_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_2_2.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_3_0.dtd b/api/src/main/resources/javax/jdo/jdoconfig_3_0.dtd
index da40bafa..0cad13ae 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_3_0.dtd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_3_0.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_3_0.xsd b/api/src/main/resources/javax/jdo/jdoconfig_3_0.xsd
index 824b847e..078321a8 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_3_0.xsd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_3_0.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_3_1.dtd b/api/src/main/resources/javax/jdo/jdoconfig_3_1.dtd
index ab82fe1b..acd601fc 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_3_1.dtd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_3_1.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_3_1.xsd b/api/src/main/resources/javax/jdo/jdoconfig_3_1.xsd
index 4111c932..443f6a60 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_3_1.xsd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_3_1.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd b/api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd
index f65216a7..3768f9cb 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd b/api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd
index eadf1f7e..ace1a358 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_2_0.dtd b/api/src/main/resources/javax/jdo/jdoquery_2_0.dtd
index 6f5d947c..daba673b 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_2_0.dtd
+++ b/api/src/main/resources/javax/jdo/jdoquery_2_0.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_2_0.xsd b/api/src/main/resources/javax/jdo/jdoquery_2_0.xsd
index 3b5166f6..cb9360e0 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_2_0.xsd
+++ b/api/src/main/resources/javax/jdo/jdoquery_2_0.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_2_1.xsd b/api/src/main/resources/javax/jdo/jdoquery_2_1.xsd
index 72be88da..0f645b27 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_2_1.xsd
+++ b/api/src/main/resources/javax/jdo/jdoquery_2_1.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_2_2.dtd b/api/src/main/resources/javax/jdo/jdoquery_2_2.dtd
index b755cd3e..2bb2c9ac 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_2_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdoquery_2_2.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_2_2.xsd b/api/src/main/resources/javax/jdo/jdoquery_2_2.xsd
index 0af90446..ea45cf10 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_2_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdoquery_2_2.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_3_0.dtd b/api/src/main/resources/javax/jdo/jdoquery_3_0.dtd
index fb253cf6..3ed29153 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_3_0.dtd
+++ b/api/src/main/resources/javax/jdo/jdoquery_3_0.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_3_0.xsd b/api/src/main/resources/javax/jdo/jdoquery_3_0.xsd
index 37df6ca8..c7e2c6e4 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_3_0.xsd
+++ b/api/src/main/resources/javax/jdo/jdoquery_3_0.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_3_1.dtd b/api/src/main/resources/javax/jdo/jdoquery_3_1.dtd
index 977e5e27..98106c1a 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_3_1.dtd
+++ b/api/src/main/resources/javax/jdo/jdoquery_3_1.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_3_1.xsd b/api/src/main/resources/javax/jdo/jdoquery_3_1.xsd
index d49acbbe..004cf8c8 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_3_1.xsd
+++ b/api/src/main/resources/javax/jdo/jdoquery_3_1.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_3_2.dtd b/api/src/main/resources/javax/jdo/jdoquery_3_2.dtd
index 7a529395..6d7cb523 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_3_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdoquery_3_2.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/jdoquery_3_2.xsd b/api/src/main/resources/javax/jdo/jdoquery_3_2.xsd
index e66e7738..af48ebd5 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_3_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdoquery_3_2.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_2_0.dtd b/api/src/main/resources/javax/jdo/orm_2_0.dtd
index 354bdcbb..17212630 100644
--- a/api/src/main/resources/javax/jdo/orm_2_0.dtd
+++ b/api/src/main/resources/javax/jdo/orm_2_0.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_2_0.xsd b/api/src/main/resources/javax/jdo/orm_2_0.xsd
index a7bf91ca..846cc8d5 100644
--- a/api/src/main/resources/javax/jdo/orm_2_0.xsd
+++ b/api/src/main/resources/javax/jdo/orm_2_0.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_2_1.xsd b/api/src/main/resources/javax/jdo/orm_2_1.xsd
index 5b60f21b..56cbe58d 100644
--- a/api/src/main/resources/javax/jdo/orm_2_1.xsd
+++ b/api/src/main/resources/javax/jdo/orm_2_1.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_2_2.dtd b/api/src/main/resources/javax/jdo/orm_2_2.dtd
index 4653ff4a..0e8aac79 100644
--- a/api/src/main/resources/javax/jdo/orm_2_2.dtd
+++ b/api/src/main/resources/javax/jdo/orm_2_2.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_2_2.xsd b/api/src/main/resources/javax/jdo/orm_2_2.xsd
index 728e1dc7..14f9d050 100644
--- a/api/src/main/resources/javax/jdo/orm_2_2.xsd
+++ b/api/src/main/resources/javax/jdo/orm_2_2.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_3_0.dtd b/api/src/main/resources/javax/jdo/orm_3_0.dtd
index 23ede46c..6ddbc643 100644
--- a/api/src/main/resources/javax/jdo/orm_3_0.dtd
+++ b/api/src/main/resources/javax/jdo/orm_3_0.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_3_0.xsd b/api/src/main/resources/javax/jdo/orm_3_0.xsd
index d41d15e6..0284b4ce 100644
--- a/api/src/main/resources/javax/jdo/orm_3_0.xsd
+++ b/api/src/main/resources/javax/jdo/orm_3_0.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_3_1.dtd b/api/src/main/resources/javax/jdo/orm_3_1.dtd
index f4d5def4..a37a6c1d 100644
--- a/api/src/main/resources/javax/jdo/orm_3_1.dtd
+++ b/api/src/main/resources/javax/jdo/orm_3_1.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_3_1.xsd b/api/src/main/resources/javax/jdo/orm_3_1.xsd
index a6905af8..e7c3d830 100644
--- a/api/src/main/resources/javax/jdo/orm_3_1.xsd
+++ b/api/src/main/resources/javax/jdo/orm_3_1.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_3_2.dtd b/api/src/main/resources/javax/jdo/orm_3_2.dtd
index e6caabba..c8b7854b 100755
--- a/api/src/main/resources/javax/jdo/orm_3_2.dtd
+++ b/api/src/main/resources/javax/jdo/orm_3_2.dtd
@@ -6,7 +6,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/api/src/main/resources/javax/jdo/orm_3_2.xsd b/api/src/main/resources/javax/jdo/orm_3_2.xsd
index 9c1572a3..02d5af51 100755
--- a/api/src/main/resources/javax/jdo/orm_3_2.xsd
+++ b/api/src/main/resources/javax/jdo/orm_3_2.xsd
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index d15c3853..b696b3c8 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -7,7 +7,7 @@
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
   
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
   
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -40,7 +40,7 @@
     <organization>
         <!-- The name is used when generating a NOTICE file -->
         <name>The Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
+        <url>https://www.apache.org</url>
     </organization>
 
     <developers>
@@ -302,6 +302,11 @@
                     <windowtitle>${project.name} ${pom.currentVersion}</windowtitle>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <version>0.14</version>
+            </plugin>
         </plugins>
     </build>
     <reporting>
diff --git a/pom.xml b/pom.xml
index fcc49905..65919155 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
   
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
   
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/building/Kitchen.java b/tck/src/main/java/org/apache/jdo/tck/pc/building/Kitchen.java
index 129cc5f4..886dd5ce 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/building/Kitchen.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/building/Kitchen.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/building/MultifunctionOven.java b/tck/src/main/java/org/apache/jdo/tck/pc/building/MultifunctionOven.java
index 0d4a269d..82946995 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/building/MultifunctionOven.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/building/MultifunctionOven.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/building/Oven.java b/tck/src/main/java/org/apache/jdo/tck/pc/building/Oven.java
index 3424dc74..048afbca 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/building/Oven.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/building/Oven.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/building/package.html b/tck/src/main/java/org/apache/jdo/tck/pc/building/package.html
index baf8e95e..c0814686 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/building/package.html
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/building/package.html
@@ -6,7 +6,7 @@
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at
  
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software 
  distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java
index f15d812a..f3da67aa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
index 498a5d2c..3ec47074 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java
index 6952f983..2cc86d79 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java
index 85f40290..a932b67f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
index 521f2d6c..0f75f04e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
index 0bd57372..3750b2df 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java
index 5cf96f01..4cadbc11 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/IAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/IAddress.java
index bf75417c..250a2db1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/IAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/IAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/ICompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/ICompany.java
index 91d9cacf..3070b641 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/ICompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/ICompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/IDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/IDentalInsurance.java
index 20d93c25..fd4362a5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/IDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/IDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/IDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/IDepartment.java
index d97f707d..147ad1cc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/IDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/IDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/IFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/IFullTimeEmployee.java
index ddc3953f..7bd76894 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/IFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/IFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/IInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/IInsurance.java
index 8803370a..728c4ac4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/IInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/IInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java
index 70bb0d59..499a17b6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/IProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/IProject.java
index 2c9c1948..c963a7dd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/IProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/IProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java
index b248fd02..1af28521 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PICompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PICompany.java
index 12e639e3..6c982f0b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PICompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PICompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java
index b551aa9b..9caf82f9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java
index ebeeda8e..48f85ef1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java
index b4db442b..2dce4672 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java
index db8c5390..27146b1e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java
index 9ce67201..bf0dfe7b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIPerson.java
index 6fc1ad04..99083ad2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIProject.java
index 1347f126..1571e0eb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PIProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PIProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
index 7cd5ee99..00105149 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
index b52ffa5b..88807087 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
index c80ed064..a8ea2cd4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCConcreteDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCConcreteDelegator.java
index 10385edb..1bf6238b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCConcreteDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCConcreteDelegator.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
index 1661dfbd..b772d016 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
index 946fc886..882dae16 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java
index f4071344..78fa84a5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
index 6aa2d35b..c93cb67f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java
index 52c26999..2554092e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java
index ec25f98d..494defbe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java
index 29957c98..79b37ef9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
index 5e5e0d94..c09f31a7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java
index eafb9d2b..cf79b78a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
index eb4a20d2..e48a0315 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
index 82932b50..e0cdae67 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
index f1505988..0991d875 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java
index ae9dc12c..68ba1c88 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java
index e765b01f..dfd17240 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java
index e55fc28b..e48ad0c6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java
index c4a89f8a..1ca7a254 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
index 10873878..cf0395bd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
index 72e24387..951b2595 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java
index 4a3452cc..da015864 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
index d42a838c..b9159d7b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java
index 36216afa..2e162d61 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
index 7eb0054f..ddbbb976 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
index cf7fb1d5..cbef486c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java
index bfe2997b..b6183ffe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java
index 5e02eea4..df7ec8c2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java
index 66c1c0d0..7510986c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
index 5469132f..7de6daff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java
index ab73d3c7..b354e0a7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
index 0f3d9e6f..d1382cb2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
index 48679335..fbc089d7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java
index 14690238..b91148d4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java
index d9a604c8..605b7802 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java
index 2783b0de..ef434442 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java
index bd780300..42f692f8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
index 28caa6ca..d1298b5c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java
index e1bd3f60..508c76d2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java
index 9eb43faa..9204f671 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
index e199cf5f..88e41ac3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java
index 46218d75..17ec2df1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java
index f560f418..421a1d69 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java
index 58ae323c..e006c326 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java
index 0a1248d7..366dbab7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
index 27aacda2..607d8f73 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java
index 8c3b6095..ebad2ae1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java
index 740fff5c..996dec58 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
index 248c868b..40bffc57 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
index 0398a9d0..aa4dffe2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java
index c38eacde..96055304 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
index 5e4f4de7..d518bae3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
index 9e69a7ae..0a12064c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java
index eb868aca..16bc7f77 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java
index 2086ff55..ff12c536 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
index a1d3d6fb..b923da86 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java
index 1c3184e6..0ccf0251 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java
index 81a33c3a..f2b0683a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
index 39e99f46..1794a2a6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java
index ce15265b..ef8b5664 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java
index 397af462..7acdd272 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java
index 76718e9a..d69abdde 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java
index 678aea10..6858014a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
index d7544106..3f5d8c5b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java
index dbe1c896..bbcc94f3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java
index f5217f0a..228a0d45 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
index a8e5b67f..e161b34b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java
index 5930179f..7af851c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java
index 881326e5..7540c391 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
index a0e22869..1ab6ff75 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java
index 7914593b..5725b597 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java
index 474cf929..5396a829 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java
index 3d65ed9e..ea4b6579 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java
index 58606f52..d91b6173 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
index 165504b9..9ce2fce9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java
index dfd113ad..02297ac9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
index 8cace61c..e85befdc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java
index cac560bf..be5322ac 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
index 21efc78e..5bd4051c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java
index a1e4cfb2..e6d3beb8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
index b063cd6e..fe1744ea 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java
index 7097d1f6..a9950c90 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
index dff4d847..861adf76 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
index e2cc7bb7..190824d9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java
index 9c61e745..8c579b2e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java
index cd1d047a..7ac48d98 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
index d7eabd74..7e338fb5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
index ccec7f44..ab749106 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java
index 7f3e8bfa..0b341155 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
index a6681315..9ac13122 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java
index 71541e08..8ff0eb6f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
index c7fa01e4..2262e792 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
index f838c322..a8c74111 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java
index 1efc7b15..5d966c85 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
index 4d6d0f2e..7fa80549 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java
index 73c81a37..6f865cf7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
index 6fae2428..ceec8f7d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
index 67c6fe4c..41922175 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
index 9cc4a7b3..acb0bb06 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java
index bc1df6df..46017a59 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
index 4bf00654..d9b8bd09 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java
index 6567c79f..fab50afa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
index d2ea09db..7c15e1e4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java
index 425655c8..e2742edd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java
index 909b901b..61398725 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
index 25301c7e..73c99399 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java
index 64c4e7c5..c11747bc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
index 367f88d8..800aa78a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java
index 2b9af1aa..61e8a496 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/ICompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/ICompany.java
index 32f9ca66..e7ea23c7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/ICompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/ICompany.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IDepartment.java
index 3bcb0f03..5e372286 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IDepartment.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IEmployee.java
index 9dac1b9f..1a675a23 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IFullTimeEmployee.java
index a3b889e9..0e2eee97 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IFullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IPartTimeEmployee.java
index 3176ff20..86bf2a8f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IPartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IPerson.java
index d3b99393..534b7e8a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/IPerson.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java
index 20358543..cf7bf02a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
index 999ac0be..636241b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/compositeAnnotation/ApplicationIdDiscriminatorClassName.java b/tck/src/main/java/org/apache/jdo/tck/pc/compositeAnnotation/ApplicationIdDiscriminatorClassName.java
index 33a2084e..5a1fc32a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/compositeAnnotation/ApplicationIdDiscriminatorClassName.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/compositeAnnotation/ApplicationIdDiscriminatorClassName.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCPoint.java b/tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCPoint.java
index 357b4b06..f1c55299 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCPoint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCPoint.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCRect.java b/tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCRect.java
index 4a543dbc..e5e40f6d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCRect.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/converter/IPCRect.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPoint.java b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPoint.java
index f9beca3b..13686f0f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPoint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPoint.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointAnnotated.java b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointAnnotated.java
index 3f379cc4..26265c06 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointAnnotated.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointAnnotated.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointProp.java b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointProp.java
index 10d88a7f..58ee56fd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointProp.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointProp.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointPropAnnotated.java b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointPropAnnotated.java
index 40d3d8af..48dee76e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointPropAnnotated.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCPointPropAnnotated.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRect.java b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRect.java
index 9b398236..d071843d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRect.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRect.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRectAnnotated.java b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRectAnnotated.java
index f62f1747..380bc54d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRectAnnotated.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/converter/PCRectAnnotated.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
index 841e817f..95ea440d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
index 284ae503..30004c2b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
index 37e1e530..369b674e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
index 110c8481..7c13e397 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
index 781e8a89..28883821 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
index 4d4133aa..b5011ce7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
index 7e8f7e3d..050c94c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
index 1ce9d9cc..d9822258 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
index e15e1a4a..f30bb64e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
index 99adbee0..ed578c37 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
index ed04df3e..5662002d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
index 21a34fec..5b045b01 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
index a78a5870..02c0a684 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
index 40908bdc..5d21c474 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
index 4e313733..caa087a4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
index 63887f18..195d4509 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
index c5572439..0f579b6f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
index 99fcf641..71a1a8c5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
index dd8903ef..7bb90bc7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
index 2cda1a30..920f16c0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
index f136a81e..65bdeb38 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
index a02585c2..b61a2cfc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
index e4d5c854..0c5330fc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
index 11a2caea..98320b16 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
index 3a37351f..9e7b2c57 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
index 415b4b98..dbd54a4b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java
index 70e98545..6201ed6f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
index 6b1edc5d..20c07667 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
index ce40e0c6..4b3be84a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
index 559c9733..dee0322b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
index a613133d..25bb82ea 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
index cacdb261..7228ae79 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
index e1e9a0a3..a611d430 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
index 7abc477d..7be3c2ec 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
index 9eccf1e0..ff18a577 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
index 4b80fd48..d9123fb6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
index ec84a0ad..7d1ae6ac 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
index d715a231..322fcf74 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
index 6cd2e2f9..0d4cee6d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
index 6819be90..75d2d734 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java
index a59bb0d2..e59eaf2d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java
index eba2028a..707d6b5d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
index 219df74a..d3fa934f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
index ab168b6c..ce0add9d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
index e4b5eb21..ea29b32f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
index e8973a34..10156302 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist.java
index e79328a5..bffd43c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist2.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist2.java
index b18bb37e..650ae60c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist2.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist2.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist3.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist3.java
index bc3f08fb..c5ec989b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist3.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist3.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist4.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist4.java
index 083ed202..1ac715d4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist4.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/AllPersist4.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/Constants.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/Constants.java
index 39e0d0a9..d4f5b96e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/Constants.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/Constants.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName.java
index 6d4ae2c0..a856bdca 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName2.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName2.java
index 8fa7547e..8c16a147 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName2.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName2.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName3.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName3.java
index 2cada0a0..409ce6ac 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName3.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName3.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName4.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName4.java
index f5742030..161bc777 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName4.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/FieldSameName4.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersist.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersist.java
index 4fc620a2..d67dd72b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersist.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersist.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistB.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistB.java
index 46cf3a4d..141721cb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistB.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistB.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistC.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistC.java
index 37007b5d..1e6e2ec0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistC.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistC.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistD.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistD.java
index 2c7da8b1..ad2f6618 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistD.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistD.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistE.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistE.java
index 5d5e0244..c703ab7f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistE.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistE.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistF.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistF.java
index ac8b76ac..35d85a3e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistF.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistF.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistG.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistG.java
index 8c39320d..0d9699a8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistG.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistG.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistH.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistH.java
index c6c88a0f..cccbcb5f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistH.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopNonPersistH.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersist.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersist.java
index 00fc5581..dd0445a0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersist.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersist.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistC.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistC.java
index b032c548..69d07768 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistC.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistC.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistD.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistD.java
index f82f9f55..b8f6f197 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistD.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistD.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistE.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistE.java
index a6ea080b..5ecb6a19 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistE.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistE.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistF.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistF.java
index 2213af6b..bbae07ee 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistF.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistF.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistG.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistG.java
index ad139c92..179a288e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistG.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistG.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistH.java b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistH.java
index 3ecf9d47..f348880d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistH.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/inheritance/TopPersistH.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java
index 793c4b33..9f264104 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackNonPersistFdsClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackNonPersistFdsClass.java
index 2681b2c8..12c9bc0f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackNonPersistFdsClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackNonPersistFdsClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java b/tck/src/main/java/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java
index a060c584..72aad5b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
index 9648493a..1c0fa237 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCClass.java
index 1af26d21..4b5bff42 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCClass.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint.java
index d11c578d..02b8644e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java
index 4ed6d451..2bc5b3ac 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRect.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRect.java
index d4664903..5cda16e9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRect.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRect.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/Point.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/Point.java
index 22ed9de8..65e2f3bb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/Point.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/Point.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java
index 76952c5a..d198cef0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/VersionedPCPoint.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/VersionedPCPoint.java
index b6610e1b..80fa4df1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/VersionedPCPoint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/VersionedPCPoint.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/AAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/AAddress.java
index b4908e7a..764316b8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/AAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/AAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java
index f6ecf702..e19589a2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address.java b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address.java
index 79627cf3..d6fefccd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java
index 95f454d3..79e11dbc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/IAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/IAddress.java
index 587b7e39..ccd2ea92 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/IAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/IAddress.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java
index fbbb35d1..5e55cb9e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/JDOQLKeywordsAsFieldNames.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/JDOQLKeywordsAsFieldNames.java
index 0a02a1f5..3f85500f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/JDOQLKeywordsAsFieldNames.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/JDOQLKeywordsAsFieldNames.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalDateSample.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalDateSample.java
index 28fe6382..0c3fe13e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalDateSample.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalDateSample.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalDateTimeSample.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalDateTimeSample.java
index 936e53d2..9573b17b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalDateTimeSample.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalDateTimeSample.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalTimeSample.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalTimeSample.java
index 20fabaa5..bfd4f790 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalTimeSample.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/LocalTimeSample.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/MathSample.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/MathSample.java
index d4975567..c0525091 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/MathSample.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/MathSample.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/NamedQueriesSample.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/NamedQueriesSample.java
index 1e008442..69049a1e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/NamedQueriesSample.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/NamedQueriesSample.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/NoExtent.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/NoExtent.java
index 56254486..6fb98f71 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/NoExtent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/NoExtent.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/OptionalSample.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/OptionalSample.java
index cab58a04..bf301cb7 100755
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/OptionalSample.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/OptionalSample.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/query/TimeSample.java b/tck/src/main/java/org/apache/jdo/tck/pc/query/TimeSample.java
index cfa499d3..005f12de 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/query/TimeSample.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/query/TimeSample.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Cart.java b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Cart.java
index 8f7e0775..ec09f021 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Cart.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Cart.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/CartEntry.java b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/CartEntry.java
index e607bdfb..70a4cee0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/CartEntry.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/CartEntry.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java
index b1f2bfa9..39c11d7b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Undetachable.java b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Undetachable.java
index 7cebf99f..d360b1f1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Undetachable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Undetachable.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/AbstractPCPointSingleField.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/AbstractPCPointSingleField.java
index 60e4c76a..a7a51c92 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/AbstractPCPointSingleField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/AbstractPCPointSingleField.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Employee.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Employee.java
index 2b2d55af..f8cfd1d8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Employee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Employee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/FullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/FullTimeEmployee.java
index 3e4d1bfd..44339472 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/FullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/FullTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java
index 82be50c5..db8a40d7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java
index b2d22e74..1ab91c72 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java
index e9622867..e5e9abb7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java
index 7d3acfba..4dac5260 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java
index d2f746f0..a3c5c95f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java
index ddb2f056..d02e9f44 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java
index f185b9af..09a4a44e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java
index 04d631ce..061b0f6e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java
index 0738a466..c5c71ca5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java
index 5bb951e4..052941f9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java
index 33bc47c3..6b5d3269 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java
index 42e92854..2aa42b18 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PartTimeEmployee.java
index 1e2b3044..64f5e35d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PartTimeEmployee.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS, 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java
index 86e9e0f3..994a84bc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software 
  * distributed under the License is distributed on an "AS IS" BASIS,