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 ti...@apache.org on 2022/12/01 19:58:14 UTC
[db-jdo] 01/01: Replaced http with https
This is an automated email from the ASF dual-hosted git repository.
tilmannz pushed a commit to branch jdo-816-tilmann
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit e1a2110ade567c03e86798d1922344acb826d491
Author: Tilmann <zo...@gmx.de>
AuthorDate: Thu Dec 1 20:58:01 2022 +0100
Replaced http with https
---
.asf.yaml | 2 +-
.github/workflows/build.yml | 2 +-
.rat-excludes | 2 +-
HowToReleaseJDO.md | 2 +-
LICENSE | 2 +-
api/src/main/java/javax/jdo/Extent.java | 10 ++++++++++
api/src/main/java/javax/jdo/FetchGroup.java | 10 ++++++++++
api/src/main/java/javax/jdo/FetchPlan.java | 10 ++++++++++
api/src/main/java/javax/jdo/InstanceCallbacks.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOCanRetryException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDODataStoreException.java | 10 ++++++++++
.../main/java/javax/jdo/JDODetachedFieldAccessException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOFatalDataStoreException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOFatalException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOFatalInternalException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOFatalUserException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOHelper.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDONullIdentityException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOObjectNotFoundException.java | 10 ++++++++++
.../java/javax/jdo/JDOOptimisticVerificationException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOQLTypedQuery.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOQLTypedSubquery.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOQueryInterruptedException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOReadOnlyException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOUserCallbackException.java | 10 ++++++++++
api/src/main/java/javax/jdo/JDOUserException.java | 10 ++++++++++
api/src/main/java/javax/jdo/PersistenceManager.java | 10 ++++++++++
api/src/main/java/javax/jdo/Query.java | 10 ++++++++++
api/src/main/java/javax/jdo/Transaction.java | 10 ++++++++++
api/src/main/java/javax/jdo/datastore/DataStoreCache.java | 10 ++++++++++
api/src/main/java/javax/jdo/datastore/JDOConnection.java | 10 ++++++++++
api/src/main/java/javax/jdo/datastore/Sequence.java | 10 ++++++++++
api/src/main/java/javax/jdo/identity/ByteIdentity.java | 10 ++++++++++
api/src/main/java/javax/jdo/identity/CharIdentity.java | 10 ++++++++++
api/src/main/java/javax/jdo/identity/IntIdentity.java | 10 ++++++++++
api/src/main/java/javax/jdo/identity/LongIdentity.java | 10 ++++++++++
api/src/main/java/javax/jdo/identity/ObjectIdentity.java | 10 ++++++++++
api/src/main/java/javax/jdo/identity/ShortIdentity.java | 10 ++++++++++
api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java | 10 ++++++++++
api/src/main/java/javax/jdo/identity/StringIdentity.java | 10 ++++++++++
api/src/main/java/javax/jdo/listener/AttachCallback.java | 10 ++++++++++
.../main/java/javax/jdo/listener/AttachLifecycleListener.java | 10 ++++++++++
api/src/main/java/javax/jdo/listener/ClearCallback.java | 10 ++++++++++
.../main/java/javax/jdo/listener/ClearLifecycleListener.java | 10 ++++++++++
.../main/java/javax/jdo/listener/CreateLifecycleListener.java | 10 ++++++++++
api/src/main/java/javax/jdo/listener/DeleteCallback.java | 10 ++++++++++
.../main/java/javax/jdo/listener/DeleteLifecycleListener.java | 10 ++++++++++
api/src/main/java/javax/jdo/listener/DetachCallback.java | 10 ++++++++++
.../main/java/javax/jdo/listener/DetachLifecycleListener.java | 10 ++++++++++
.../main/java/javax/jdo/listener/DirtyLifecycleListener.java | 10 ++++++++++
.../main/java/javax/jdo/listener/InstanceLifecycleEvent.java | 10 ++++++++++
.../java/javax/jdo/listener/InstanceLifecycleListener.java | 10 ++++++++++
api/src/main/java/javax/jdo/listener/LoadCallback.java | 10 ++++++++++
.../main/java/javax/jdo/listener/LoadLifecycleListener.java | 10 ++++++++++
api/src/main/java/javax/jdo/listener/StoreCallback.java | 10 ++++++++++
.../main/java/javax/jdo/listener/StoreLifecycleListener.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/BooleanExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/ByteExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/CharacterExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/CollectionExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/ComparableExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/DateExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/DateTimeExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/EnumExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/Expression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/ListExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/LocalDateExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/LocalTimeExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/MapExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/NumericExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/ObjectExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/OptionalExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/OrderExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/PersistableExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/StringExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/SubqueryExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/query/TimeExpression.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/Detachable.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/I18NHelper.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/JDOImplHelper.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/JDOPermission.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/PersistenceCapable.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/RegisterClassEvent.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/RegisterClassListener.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/StateInterrogation.java | 10 ++++++++++
api/src/main/java/javax/jdo/spi/StateManager.java | 10 ++++++++++
api/src/test/java/javax/jdo/AbstractJDOConfigTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/EnhancerTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/JDOConfigTestClassLoader.java | 10 ++++++++++
api/src/test/java/javax/jdo/JDOHelperConfigTest.java | 2 +-
api/src/test/java/javax/jdo/JDOHelperTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/MockEnhancer.java | 10 ++++++++++
api/src/test/java/javax/jdo/ObjectStateTest.java | 2 +-
api/src/test/java/javax/jdo/PMFMapMapTest.java | 2 +-
api/src/test/java/javax/jdo/PMFProxy.java | 10 ++++++++++
api/src/test/java/javax/jdo/PMFService.java | 10 ++++++++++
api/src/test/java/javax/jdo/annotations/Line.java | 2 +-
api/src/test/java/javax/jdo/annotations/Point.java | 2 +-
api/src/test/java/javax/jdo/annotations/TestEmbeddedMap.java | 2 +-
api/src/test/java/javax/jdo/annotations/TestEmbeddedSet.java | 2 +-
api/src/test/java/javax/jdo/annotations/TestExtensions.java | 2 +-
api/src/test/java/javax/jdo/identity/ByteIdentityTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/identity/CharIdentityTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java | 10 ++++++++++
api/src/test/java/javax/jdo/identity/IntIdentityTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/identity/LongIdentityTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/identity/ShortIdentityTest.java | 10 ++++++++++
.../test/java/javax/jdo/identity/SingleFieldIdentityTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/identity/StringIdentityTest.java | 10 ++++++++++
.../java/javax/jdo/listener/InstanceLifecycleEventTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/pc/PCPoint.java | 10 ++++++++++
api/src/test/java/javax/jdo/schema/XMLTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/spi/StateInterrogationTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/stub/StubPMF.java | 10 ++++++++++
api/src/test/java/javax/jdo/util/AbstractTest.java | 10 ++++++++++
api/src/test/java/javax/jdo/util/BatchResultPrinter.java | 10 ++++++++++
api/src/test/java/javax/jdo/util/BatchTestRunner.java | 10 ++++++++++
api/src/test/java/javax/jdo/util/XMLTestUtil.java | 10 ++++++++++
api/src/test/resources/META-INF/services/javax.jdo.JDOEnhancer | 2 +-
api/src/test/resources/Negative0-dtd.jdo | 2 +-
api/src/test/resources/Negative0-dtd.jdoquery | 2 +-
api/src/test/resources/Negative0-dtd.orm | 2 +-
api/src/test/resources/Negative0-xsd.jdo | 2 +-
api/src/test/resources/Negative0-xsd.jdoquery | 2 +-
api/src/test/resources/Negative0-xsd.orm | 2 +-
api/src/test/resources/Positive0-dtd.jdo | 2 +-
api/src/test/resources/Positive0-dtd.jdoquery | 2 +-
api/src/test/resources/Positive0-dtd.orm | 2 +-
api/src/test/resources/Positive0-xsd.jdo | 2 +-
api/src/test/resources/Positive0-xsd.jdoquery | 2 +-
api/src/test/resources/Positive0-xsd.orm | 2 +-
api/src/test/resources/Positive1-dtd.jdo | 2 +-
api/src/test/resources/Positive1-dtd.orm | 2 +-
api/src/test/resources/Positive1-xsd.jdo | 2 +-
api/src/test/resources/Positive1-xsd.orm | 2 +-
api/src/test/resources/Positive15.1-dtd.orm | 2 +-
api/src/test/resources/Positive15.1-xsd.orm | 2 +-
api/src/test/resources/Positive15.2.1-dtd.orm | 2 +-
api/src/test/resources/Positive15.2.1-xsd.orm | 2 +-
api/src/test/resources/Positive15.2.2-dtd.orm | 2 +-
api/src/test/resources/Positive15.2.2-xsd.orm | 2 +-
api/src/test/resources/Positive15.3.1-dtd.orm | 2 +-
api/src/test/resources/Positive15.3.1-xsd.orm | 2 +-
api/src/test/resources/Positive15.3.2-dtd.orm | 2 +-
api/src/test/resources/Positive15.3.2-xsd.orm | 2 +-
api/src/test/resources/Positive15.3.3-dtd.orm | 2 +-
api/src/test/resources/Positive15.3.3-xsd.orm | 2 +-
api/src/test/resources/Positive15.3.4-dtd.orm | 2 +-
api/src/test/resources/Positive15.3.4-xsd.orm | 2 +-
api/src/test/resources/Positive15.3.5-dtd.orm | 2 +-
api/src/test/resources/Positive15.3.5-xsd.orm | 2 +-
api/src/test/resources/Positive15.3.6-dtd.orm | 2 +-
api/src/test/resources/Positive15.3.6-xsd.orm | 2 +-
api/src/test/resources/Positive15.4-dtd.orm | 2 +-
api/src/test/resources/Positive15.4-xsd.orm | 2 +-
api/src/test/resources/Positive15.5-dtd.orm | 2 +-
api/src/test/resources/Positive15.5-xsd.orm | 2 +-
api/src/test/resources/Positive15.6-dtd.orm | 2 +-
api/src/test/resources/Positive15.6-xsd.orm | 2 +-
api/src/test/resources/Positive15.8.1-dtd.orm | 2 +-
api/src/test/resources/Positive15.8.1-xsd.orm | 2 +-
api/src/test/resources/Positive15.8.2-dtd.orm | 2 +-
api/src/test/resources/Positive15.8.2-xsd.orm | 2 +-
api/src/test/resources/Positive15.8.3-dtd.orm | 2 +-
api/src/test/resources/Positive15.8.3-xsd.orm | 2 +-
api/src/test/resources/Positive99-dtd.jdo | 2 +-
api/src/test/resources/Positive99-dtd.jdoquery | 2 +-
api/src/test/resources/Positive99-dtd.orm | 2 +-
api/src/test/resources/Positive99-xsd.jdo | 2 +-
api/src/test/resources/Positive99-xsd.jdoquery | 2 +-
api/src/test/resources/Positive99-xsd.orm | 2 +-
.../resources/enhancer-test-dir/enhancer-test-subdir/file4.jdo | 2 +-
api/src/test/resources/enhancer-test-dir/file1.jdo | 2 +-
.../test/resources/jdoconfig/Negative00/META-INF/jdoconfig.xml | 2 +-
.../test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml | 2 +-
.../test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml | 2 +-
.../test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml | 2 +-
.../test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml | 2 +-
.../test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml | 2 +-
.../resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.xml | 2 +-
.../resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.xml | 2 +-
.../META-INF/services/javax.jdo.PersistenceManagerFactory | 2 +-
.../META-INF/services/javax.jdo.PersistenceManagerFactory | 2 +-
.../resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.xml | 2 +-
.../9a/META-INF/services/javax.jdo.PersistenceManagerFactory | 2 +-
.../9b/META-INF/services/javax.jdo.PersistenceManagerFactory | 2 +-
.../resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml | 2 +-
api/src/test/resources/jdoconfig/Pmfmapmap02/propsfile.props | 2 +-
.../test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml | 2 +-
.../resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.xml | 2 +-
.../resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.xml | 2 +-
.../test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml | 2 +-
.../test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml | 2 +-
.../META-INF/services/javax.jdo.PersistenceManagerFactory | 2 +-
.../test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml | 2 +-
.../META-INF/services/javax.jdo.PersistenceManagerFactory | 2 +-
.../test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml | 2 +-
.../META-INF/services/javax.jdo.PersistenceManagerFactory | 2 +-
.../test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml | 2 +-
.../test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml | 2 +-
exectck/pom.xml | 2 +-
.../src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java | 2 +-
exectck/src/main/java/org/apache/jdo/exectck/Enhance.java | 10 ++++++++++
exectck/src/main/java/org/apache/jdo/exectck/Help.java | 10 ++++++++++
.../src/main/java/org/apache/jdo/exectck/InstallSchema.java | 2 +-
.../src/main/java/org/apache/jdo/exectck/PropertyUtils.java | 2 +-
exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java | 2 +-
.../src/main/java/org/apache/jdo/exectck/SQLFileLoader.java | 2 +-
exectck/src/main/java/org/apache/jdo/exectck/Utilities.java | 10 ++++++++++
jdo_checks.xml | 2 +-
parent-pom/pom.xml | 4 ++++
tck/NOTICE.txt | 2 +-
tck/RunRules.md | 2 +-
tck/pom.xml | 2 +-
tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java | 2 +-
tck/src/main/java/org/apache/jdo/tck/JDO_Test.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java | 10 ++++++++++
.../jdo/tck/api/converter/IntAttributeConverterTest.java | 2 +-
.../jdo/tck/api/converter/PointAttributeConverterTest.java | 2 +-
.../apache/jdo/tck/api/exceptions/ExceptionConstructor.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java | 10 ++++++++++
.../instancecallbacks/AbstractInstanceLifecycleListener.java | 10 ++++++++++
.../api/instancecallbacks/AccessOtherInstancesInPrestore.java | 10 ++++++++++
.../tck/api/instancecallbacks/AccessingFieldsInPredelete.java | 10 ++++++++++
.../jdo/tck/api/instancecallbacks/CallingJdoPostload.java | 10 ++++++++++
.../jdo/tck/api/instancecallbacks/CallingJdoPreclear.java | 10 ++++++++++
.../jdo/tck/api/instancecallbacks/CallingJdoPredelete.java | 10 ++++++++++
.../jdo/tck/api/instancecallbacks/CallingJdoPrestore.java | 10 ++++++++++
.../api/instancecallbacks/InstanceLifecycleListenerAttach.java | 10 ++++++++++
.../api/instancecallbacks/InstanceLifecycleListenerClear.java | 10 ++++++++++
.../api/instancecallbacks/InstanceLifecycleListenerCreate.java | 10 ++++++++++
.../api/instancecallbacks/InstanceLifecycleListenerDelete.java | 10 ++++++++++
.../api/instancecallbacks/InstanceLifecycleListenerDetach.java | 10 ++++++++++
.../api/instancecallbacks/InstanceLifecycleListenerDirty.java | 10 ++++++++++
.../api/instancecallbacks/InstanceLifecycleListenerLoad.java | 10 ++++++++++
.../api/instancecallbacks/InstanceLifecycleListenerStore.java | 10 ++++++++++
.../ModificationOfNontransactionalNonpersistentFields.java | 10 ++++++++++
.../api/instancecallbacks/NoAccessToFieldsAfterPredelete.java | 10 ++++++++++
.../org/apache/jdo/tck/api/instancecallbacks/TestParts.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java | 10 ++++++++++
.../org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java | 10 ++++++++++
.../apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java | 10 ++++++++++
.../tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java | 10 ++++++++++
.../apache/jdo/tck/api/jdohelper/GetPersistenceManager.java | 10 ++++++++++
.../jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java | 10 ++++++++++
.../tck/api/jdohelper/GetPersistenceManagerForTransient.java | 10 ++++++++++
.../jdohelper/GetPersistenceManagerNotPersistenceCapable.java | 10 ++++++++++
.../apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java | 10 ++++++++++
.../jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java | 10 ++++++++++
.../api/jdohelper/GetTransactionalObjectIdForTransient.java | 10 ++++++++++
.../GetTransactionalObjectIdNotPersistenceCapable.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java | 10 ++++++++++
.../org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java | 10 ++++++++++
.../apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java | 10 ++++++++++
.../jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java | 10 ++++++++++
.../org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java | 10 ++++++++++
.../jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java | 10 ++++++++++
.../org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java | 10 ++++++++++
.../jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java | 10 ++++++++++
.../org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java | 10 ++++++++++
.../org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java | 10 ++++++++++
.../apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java | 10 ++++++++++
.../tck/api/jdohelper/IsPersistentNotPersistenceCapable.java | 10 ++++++++++
.../java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java | 10 ++++++++++
.../org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java | 10 ++++++++++
.../apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java | 10 ++++++++++
.../jdo/tck/api/jdohelper/IsTransactionalForTransient.java | 10 ++++++++++
.../api/jdohelper/IsTransactionalNotPersistenceCapable.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java | 10 ++++++++++
.../org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java | 10 ++++++++++
.../apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java | 10 ++++++++++
.../jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java | 10 ++++++++++
.../api/persistencecapable/AbstractPersistenceCapableTest.java | 10 ++++++++++
.../tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java | 10 ++++++++++
.../jdo/tck/api/persistencecapable/NewObjectIdInstance.java | 10 ++++++++++
.../ChangingObjectIdHasNoEffectOnInstance.java | 10 ++++++++++
.../api/persistencemanager/ConcurrentPersistenceManagers.java | 10 ++++++++++
.../ConcurrentPersistenceManagersSameClasses.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/CurrentTransaction.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/DataStoreCacheTest.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/DataStoreConnection.java | 10 ++++++++++
.../tck/api/persistencemanager/DataStoreConnectionThrows.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/DatastoreTimeout.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/DeletePersistent.java | 10 ++++++++++
.../tck/api/persistencemanager/DeletePersistentAllFails.java | 10 ++++++++++
.../DeletePersistentFailsIfInstanceIsTransient.java | 10 ++++++++++
...stentFailsIfInstanceManagedByAnotherPersistenceManager.java | 10 ++++++++++
.../DeletePersistentHasNoEffectOnDeletedInstances.java | 10 ++++++++++
.../api/persistencemanager/GetPersistenceManagerFactory.java | 10 ++++++++++
.../apache/jdo/tck/api/persistencemanager/GetProperties.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/GetSetUserObject.java | 10 ++++++++++
.../GetTransactionalObjectIdWhenObjectIdBeingChanged.java | 10 ++++++++++
.../GetTransactionalObjectIdWithNoTransaction.java | 10 ++++++++++
.../org/apache/jdo/tck/api/persistencemanager/NewInstance.java | 10 ++++++++++
.../persistencemanager/NoPersistenceManagerIfTransient.java | 10 ++++++++++
.../api/persistencemanager/ObjectIdUniqueAmongInstances.java | 10 ++++++++++
.../OneInstanceOfObjectPerPersistenceManager.java | 10 ++++++++++
.../OnePersistenceManagerIfPersistentOrTransactional.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/OptimisticFailure.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/PersistenceManagerTest.java | 10 ++++++++++
...SameTransactionInstanceForAllCallsToCurrentTransaction.java | 10 ++++++++++
.../org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java | 10 ++++++++++
.../TransientTransactionalInstanceRetainsValuesAtCommit.java | 10 ++++++++++
.../cache/CallingEvictAllWithCollectionContainingNulls.java | 10 ++++++++++
.../cache/CallingRefreshAllWithCollectionContainingNulls.java | 10 ++++++++++
.../api/persistencemanager/cache/EvictAllWithNoParameters.java | 10 ++++++++++
.../cache/EvictingCollectionOfInstancesSideEffects.java | 10 ++++++++++
.../cache/EvictingWithRestoreValuesFalse.java | 10 ++++++++++
.../cache/EvictingWithRetainValuesFalse.java | 10 ++++++++++
.../cache/PassingNullToEvictAllThrowsException.java | 10 ++++++++++
.../cache/PassingNullToEvictHasNoEffect.java | 10 ++++++++++
.../cache/PassingNullToRefreshAllThrowsException.java | 10 ++++++++++
.../cache/PassingNullToRefreshHasNoEffect.java | 10 ++++++++++
.../cache/RefreshAllNoParameterSideEffects.java | 10 ++++++++++
.../api/persistencemanager/cache/RefreshAllSideEffects.java | 10 ++++++++++
.../persistencemanager/cache/RefreshAllWithNoParameters.java | 10 ++++++++++
.../tck/api/persistencemanager/cache/RefreshSideEffects.java | 10 ++++++++++
.../apache/jdo/tck/api/persistencemanager/cache/Retrieve.java | 10 ++++++++++
.../close/AfterCloseAllMethodsThrowException.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/close/AutoCloseable.java | 10 ++++++++++
.../persistencemanager/close/CloseWithActiveTxRollsBack.java | 10 ++++++++++
.../close/IsClosedIsFalseUponConstruction.java | 10 ++++++++++
.../close/IsClosedIsFalseUponRetrievalFromPool.java | 10 ++++++++++
.../api/persistencemanager/close/IsClosedIsTrueAfterClose.java | 10 ++++++++++
.../tck/api/persistencemanager/detach/CopyOnAttachFalse.java | 10 ++++++++++
.../persistencemanager/detach/DetachAccessUnloadedField.java | 10 ++++++++++
.../tck/api/persistencemanager/detach/DetachAllOnCommit.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/detach/DetachAttach.java | 10 ++++++++++
.../tck/api/persistencemanager/detach/DetachAttachDirty.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/detach/DetachCopy.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/detach/DetachSerialize.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/detach/DetachTest.java | 10 ++++++++++
.../tck/api/persistencemanager/detach/DetachUndetachable.java | 10 ++++++++++
.../api/persistencemanager/detach/SetDetachAllOnCommit.java | 10 ++++++++++
.../GetExtentWithInstancesMadePersistentViaReachability.java | 10 ++++++++++
.../persistencemanager/extent/GetExtentWithNoSubclasses.java | 10 ++++++++++
.../api/persistencemanager/extent/GetExtentWithSubclasses.java | 10 ++++++++++
.../persistencemanager/fetchplan/AbstractFetchPlanTest.java | 10 ++++++++++
.../api/persistencemanager/fetchplan/FetchPlanInterface.java | 10 ++++++++++
.../tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java | 10 ++++++++++
.../persistencemanager/fetchplan/FetchPlanMakeTransient.java | 10 ++++++++++
.../tck/api/persistencemanager/fetchplan/FetchPlanQuery.java | 10 ++++++++++
.../tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java | 10 ++++++++++
.../api/persistencemanager/fetchplan/FetchPlanRetrieve.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java | 10 ++++++++++
.../api/persistencemanager/flags/SetIgnoreCacheToFalse.java | 10 ++++++++++
.../tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java | 10 ++++++++++
.../api/persistencemanager/flags/SetMultithreadedFalse.java | 10 ++++++++++
.../tck/api/persistencemanager/flags/SetMultithreadedTrue.java | 10 ++++++++++
.../flags/SettingFlagsWithTransactionInstance.java | 10 ++++++++++
.../tck/api/persistencemanager/getobject/GetObjectById.java | 10 ++++++++++
.../persistencemanager/getobject/GetObjectByIdExactClass.java | 10 ++++++++++
.../getobject/GetObjectByIdNoValidationInstanceInCache.java | 10 ++++++++++
.../GetObjectByIdNoValidationInstanceInCacheNoStateChange.java | 10 ++++++++++
.../getobject/GetObjectByIdNoValidationInstanceNotInCache.java | 10 ++++++++++
.../GetObjectByIdNoValidationInstanceNotInCacheNoTx.java | 10 ++++++++++
.../GetObjectByIdNoValidationInstanceNotInDatastore.java | 10 ++++++++++
.../persistencemanager/getobject/GetObjectByIdNotResolved.java | 10 ++++++++++
.../getobject/GetObjectByIdWithValidationInstanceInCache.java | 10 ++++++++++
...tObjectByIdWithValidationInstanceInCacheNotInDatastore.java | 10 ++++++++++
...jectByIdWithValidationInstanceNotInCacheNotInDatastore.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/getobject/GetObjectId.java | 10 ++++++++++
.../tck/api/persistencemanager/getobject/GetObjectIdClass.java | 10 ++++++++++
...etObjectIdClassForAbstractOrNonPersistenceCapableClass.java | 10 ++++++++++
.../getobject/GetObjectIdForNullOrNotPersistent.java | 10 ++++++++++
.../getobject/GetObjectIdForPersistentInterface.java | 10 ++++++++++
.../getobject/GetObjectIdWithApplicationModifyingIdentity.java | 10 ++++++++++
.../tck/api/persistencemanager/getobject/GetObjectsById.java | 10 ++++++++++
.../lifecycle/MakeNontransactionalAllFails.java | 10 ++++++++++
.../lifecycle/MakeNontransactionalDirtyInstance.java | 10 ++++++++++
.../lifecycle/MakeNontransactionalIsImmediate.java | 10 ++++++++++
.../lifecycle/MakeNontransactionalPersistentCleanInstance.java | 10 ++++++++++
.../lifecycle/MakeNontransactionalTransientCleanInstance.java | 10 ++++++++++
.../tck/api/persistencemanager/lifecycle/MakePersistent.java | 10 ++++++++++
.../persistencemanager/lifecycle/MakePersistentAllFails.java | 10 ++++++++++
.../lifecycle/MakePersistentAndInstancesNotReachable.java | 10 ++++++++++
.../lifecycle/MakePersistentAssignsObjectId.java | 10 ++++++++++
...stentFailsIfInstanceManagedByAnotherPersistenceManager.java | 10 ++++++++++
.../MakePersistentHasNoEffectOnPersistentInstances.java | 10 ++++++++++
.../api/persistencemanager/lifecycle/MakeTransactional.java | 10 ++++++++++
.../MakeTransactionalANontransactionalPersistentInstance.java | 10 ++++++++++
.../lifecycle/MakeTransactionalAllFails.java | 10 ++++++++++
.../lifecycle/MakeTransactionalIsImmediate.java | 10 ++++++++++
.../MakeTransactionalPriorToTransactionRolledback.java | 10 ++++++++++
.../MakeTransactionalWithinTransactionRolledback.java | 10 ++++++++++
.../tck/api/persistencemanager/lifecycle/MakeTransient.java | 10 ++++++++++
.../persistencemanager/lifecycle/MakeTransientAllFails.java | 10 ++++++++++
.../lifecycle/MakeTransientCausesLossOfIdentity.java | 10 ++++++++++
.../lifecycle/MakeTransientFailsWithDirtyInstance.java | 10 ++++++++++
.../lifecycle/MakeTransientFieldsPreservedUnchanged.java | 10 ++++++++++
.../MakeTransientHasNoEffectOnTransientInstances.java | 10 ++++++++++
.../lifecycle/MakeTransientNotSubjectToRollback.java | 10 ++++++++++
.../persistencemanager/nullargs/DeletePersistentNullArgs.java | 10 ++++++++++
.../api/persistencemanager/nullargs/DetachCopyNullArgs.java | 10 ++++++++++
.../jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java | 10 ++++++++++
.../nullargs/MakeNontransactionalNullArgs.java | 10 ++++++++++
.../persistencemanager/nullargs/MakePersistentNullArgs.java | 10 ++++++++++
.../persistencemanager/nullargs/MakeTransactionalNullArgs.java | 10 ++++++++++
.../api/persistencemanager/nullargs/MakeTransientNullArgs.java | 10 ++++++++++
.../nullargs/PersistenceManagerNullsTest.java | 10 ++++++++++
.../tck/api/persistencemanager/nullargs/RefreshNullArgs.java | 10 ++++++++++
.../tck/api/persistencemanager/nullargs/RetrieveNullArgs.java | 10 ++++++++++
.../nullargs/RetrieveWithFetchPlanNullArgs.java | 10 ++++++++++
.../jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java | 10 ++++++++++
.../AfterCloseGetPMThrowsException.java | 10 ++++++++++
.../AfterCloseSetMethodsThrowException.java | 10 ++++++++++
.../AfterGetPersistenceManagerNoSetMethodsSucceed.java | 10 ++++++++++
.../apache/jdo/tck/api/persistencemanagerfactory/Close.java | 10 ++++++++++
.../CloseFailsIfTransactionActive.java | 10 ++++++++++
.../CloseWithoutPermissionThrowsSecurityException.java | 10 ++++++++++
.../api/persistencemanagerfactory/FlushThrowsIfReadOnly.java | 10 ++++++++++
.../tck/api/persistencemanagerfactory/GetManagedClasses.java | 10 ++++++++++
.../jdo/tck/api/persistencemanagerfactory/GetPMFByFile.java | 10 ++++++++++
.../persistencemanagerfactory/GetPMFByFileAndClassLoader.java | 10 ++++++++++
.../api/persistencemanagerfactory/GetPMFByJNDILocation.java | 10 ++++++++++
.../GetPMFByJNDILocationAndClassLoader.java | 10 ++++++++++
.../tck/api/persistencemanagerfactory/GetPMFByResource.java | 10 ++++++++++
.../GetPMFByResourceAndClassLoader.java | 10 ++++++++++
.../jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java | 10 ++++++++++
.../GetPMFByStreamAndClassLoader.java | 10 ++++++++++
.../api/persistencemanagerfactory/GetPersistenceManager.java | 10 ++++++++++
.../GetPersistenceManagerFactoryByPropertiesInstance.java | 10 ++++++++++
.../GetPersistenceManagerForUser.java | 10 ++++++++++
.../jdo/tck/api/persistencemanagerfactory/GetProperties.java | 10 ++++++++++
.../api/persistencemanagerfactory/SetConnectionPassword.java | 10 ++++++++++
.../tck/api/persistencemanagerfactory/SetConnectionURL.java | 10 ++++++++++
.../api/persistencemanagerfactory/SetConnectionUserName.java | 10 ++++++++++
.../jdo/tck/api/persistencemanagerfactory/SetIgnoreCache.java | 10 ++++++++++
.../tck/api/persistencemanagerfactory/SetMultithreaded.java | 10 ++++++++++
.../api/persistencemanagerfactory/SetNonTransactionalRead.java | 10 ++++++++++
.../persistencemanagerfactory/SetNonTransactionalWrite.java | 10 ++++++++++
.../jdo/tck/api/persistencemanagerfactory/SetOptimistic.java | 10 ++++++++++
.../jdo/tck/api/persistencemanagerfactory/SetReadOnly.java | 10 ++++++++++
.../jdo/tck/api/persistencemanagerfactory/SetRetainValues.java | 10 ++++++++++
.../SetTransactionIsolationLevel.java | 10 ++++++++++
.../tck/api/persistencemanagerfactory/SupportedOptions.java | 10 ++++++++++
.../persistencemanagerfactory/config/JDOConfigListener.java | 10 ++++++++++
.../tck/api/persistencemanagerfactory/config/Jdoconfig.java | 10 ++++++++++
.../tck/api/persistencemanagerfactory/config/Persistence.java | 10 ++++++++++
.../api/persistencemanagerfactory/config/StoreListener.java | 10 ++++++++++
.../config/StoreListenerGetInstance.java | 10 ++++++++++
.../config/ThrowOnUnknownStandardProperties.java | 10 ++++++++++
.../persistencemanagerfactory/metadata/GetMetadataTest.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/enhancement/EnhancerTest.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/extents/AutoCloseable.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/extents/CloseAll.java | 10 ++++++++++
.../tck/extents/CloseOfExtentIteratorIsIteratorSpecific.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java | 10 ++++++++++
.../java/org/apache/jdo/tck/extents/GetCandidateClass.java | 10 ++++++++++
.../java/org/apache/jdo/tck/extents/GetPersistenceManager.java | 10 ++++++++++
.../java/org/apache/jdo/tck/extents/HasSubclassesFalse.java | 10 ++++++++++
.../java/org/apache/jdo/tck/extents/HasSubclassesTrue.java | 10 ++++++++++
.../extents/InstancesDeletedPriorToIterationNotReturned.java | 10 ++++++++++
.../extents/InstancesPersistedPriorToIterationReturned.java | 10 ++++++++++
.../jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java | 10 ++++++++++
.../org/apache/jdo/tck/extents/IteratorMutatingMethods.java | 10 ++++++++++
.../apache/jdo/tck/extents/IteratorNextAfterExtentClose.java | 10 ++++++++++
.../jdo/tck/extents/IteratorNextAfterExtentCloseAll.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/extents/Iterators.java | 10 ++++++++++
.../apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java | 10 ++++++++++
.../MultiplePMsReturnInstancesRepresentingSamePC.java | 10 ++++++++++
.../tck/lifecycle/NontransactionalWriteDatastoreCommit.java | 10 ++++++++++
.../NontransactionalWriteDatastoreCommitConflict.java | 10 ++++++++++
.../tck/lifecycle/NontransactionalWriteDatastoreRollback.java | 10 ++++++++++
.../tck/lifecycle/NontransactionalWriteOptimisticCommit.java | 10 ++++++++++
.../NontransactionalWriteOptimisticCommitConflict.java | 10 ++++++++++
.../tck/lifecycle/NontransactionalWriteOptimisticRollback.java | 10 ++++++++++
.../apache/jdo/tck/lifecycle/NontransactionalWriteTest.java | 10 ++++++++++
.../apache/jdo/tck/lifecycle/NontransactionalWriteThrows.java | 10 ++++++++++
.../ObjectIdNotModifiedWhenObjectIdInstanceModified.java | 10 ++++++++++
.../lifecycle/PMReturnsIdenticalInstancesForEqualObjIds.java | 10 ++++++++++
.../tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java | 10 ++++++++++
.../java/org/apache/jdo/tck/lifecycle/StateTransitions.java | 10 ++++++++++
.../jdo/tck/lifecycle/StateTransitionsReturnedObjects.java | 10 ++++++++++
.../jdo/tck/lifecycle/TransientTransactionalStateCommit.java | 10 ++++++++++
.../jdo/tck/lifecycle/TransientTransactionalStateRollback.java | 10 ++++++++++
.../org/apache/jdo/tck/mapping/AbstractRelationshipTest.java | 2 +-
.../main/java/org/apache/jdo/tck/mapping/CompletenessTest.java | 10 ++++++++++
.../java/org/apache/jdo/tck/mapping/CompletenessTestJPA.java | 10 ++++++++++
.../java/org/apache/jdo/tck/mapping/CompletenessTestList.java | 10 ++++++++++
.../java/org/apache/jdo/tck/mapping/CompletenessTestMap.java | 10 ++++++++++
.../java/org/apache/jdo/tck/mapping/CompletenessTestOrder.java | 10 ++++++++++
.../jdo/tck/mapping/Relationship1To1AllRelationships.java | 2 +-
.../jdo/tck/mapping/Relationship1To1NoRelationships.java | 2 +-
.../jdo/tck/mapping/Relationship1ToManyAllRelationships.java | 2 +-
.../jdo/tck/mapping/Relationship1ToManyNoRelationships.java | 2 +-
.../tck/mapping/RelationshipManyToManyAllRelationships.java | 2 +-
.../jdo/tck/mapping/RelationshipManyToManyNoRelationships.java | 2 +-
.../apache/jdo/tck/mapping/RelationshipNegative1To1Test.java | 2 +-
.../jdo/tck/mapping/RelationshipNegative1ToManyTest.java | 2 +-
.../apache/jdo/tck/models/embedded/EmbeddedInheritance.java | 10 ++++++++++
.../models/embedded/SecondClassObjectsTrackTheirChanges.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestArrayCollections.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestArrayListCollections.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestCollectionCollections.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java | 10 ++++++++++
.../org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java | 10 ++++++++++
.../org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java | 10 ++++++++++
.../org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java | 10 ++++++++++
.../tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java | 2 +-
.../jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java | 10 ++++++++++
.../tck/models/fieldtypes/TestHashMapStringKeyCollections.java | 10 ++++++++++
.../models/fieldtypes/TestHashMapStringValueCollections.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestHashSetCollections.java | 10 ++++++++++
.../models/fieldtypes/TestHashtableStringKeyCollections.java | 10 ++++++++++
.../models/fieldtypes/TestHashtableStringValueCollections.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestLinkedListCollections.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestListCollections.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java | 10 ++++++++++
.../tck/models/fieldtypes/TestMapStringValueCollections.java | 10 ++++++++++
.../apache/jdo/tck/models/fieldtypes/TestSetCollections.java | 10 ++++++++++
.../tck/models/fieldtypes/TestTreeMapStringKeyCollections.java | 10 ++++++++++
.../models/fieldtypes/TestTreeMapStringValueCollections.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestTreeSetCollections.java | 10 ++++++++++
.../java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java | 10 ++++++++++
.../jdo/tck/models/fieldtypes/TestVectorCollections.java | 10 ++++++++++
.../tck/models/inheritance/FieldWithSameNameInSuperclass.java | 10 ++++++++++
.../NonPersistentFieldsAreNonPersistentInSubclasses.java | 10 ++++++++++
.../jdo/tck/models/inheritance/NonpersistentSuperClass.java | 10 ++++++++++
.../PersistenceCapableFlexibilityInInheritanceHierarchy.java | 10 ++++++++++
.../inheritance/PersistentFieldsArePersistentInSubClasses.java | 10 ++++++++++
.../java/org/apache/jdo/tck/models/inheritance/TestParts.java | 10 ++++++++++
.../TransactionalFieldsAreTransactionalInSubclasses.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/building/Kitchen.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/building/MultifunctionOven.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/building/Oven.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/Company.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/CompanyFactory.java | 10 ++++++++++
.../apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java | 2 +-
.../apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java | 10 ++++++++++
.../apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java | 2 +-
.../org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/CompanyModelReader.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/DentalInsurance.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/Department.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/Employee.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/IAddress.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/ICompany.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/IDentalInsurance.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/IDepartment.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/IEmployee.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/IFullTimeEmployee.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/IInsurance.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/IMeetingRoom.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/IPartTimeEmployee.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/IPerson.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/IProject.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/Insurance.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/MedicalInsurance.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/PIAddress.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/PICompany.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/PIDepartment.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/PIEmployee.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/PIInsurance.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/PIPerson.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/PIProject.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/company/Project.java | 10 ++++++++++
.../DatastoreIdDiscriminatorClassNameInheritanceNew.java | 10 ++++++++++
...DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java | 10 ++++++++++
.../CompanyFactoryAnnotatedPIPMDelegator.java | 2 +-
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java | 10 ++++++++++
.../jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java | 10 ++++++++++
.../jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java | 10 ++++++++++
.../tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java | 10 ++++++++++
.../jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyListWithoutJoin/Department.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java | 10 ++++++++++
.../jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyListWithoutJoin/ICompany.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyListWithoutJoin/IDepartment.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyListWithoutJoin/IEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyListWithoutJoin/IFullTimeEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyListWithoutJoin/IPartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyListWithoutJoin/IPerson.java | 10 ++++++++++
.../jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java | 10 ++++++++++
.../jdo/tck/pc/companyMapWithoutJoin/CompanyFactory.java | 10 ++++++++++
.../pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java | 2 +-
.../pc/companyMapWithoutJoin/CompanyFactoryConcreteClass.java | 2 +-
.../tck/pc/companyMapWithoutJoin/CompanyFactoryPMClass.java | 2 +-
.../pc/companyMapWithoutJoin/CompanyFactoryPMInterface.java | 2 +-
.../tck/pc/companyMapWithoutJoin/CompanyFactoryRegistry.java | 10 ++++++++++
.../jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyMapWithoutJoin/Department.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java | 10 ++++++++++
.../jdo/tck/pc/companyMapWithoutJoin/FullTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyMapWithoutJoin/ICompany.java | 10 ++++++++++
.../apache/jdo/tck/pc/companyMapWithoutJoin/IDepartment.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyMapWithoutJoin/IFullTimeEmployee.java | 10 ++++++++++
.../jdo/tck/pc/companyMapWithoutJoin/IPartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyMapWithoutJoin/IPerson.java | 10 ++++++++++
.../jdo/tck/pc/companyMapWithoutJoin/PartTimeEmployee.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java | 10 ++++++++++
.../ApplicationIdDiscriminatorClassName.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/CollectionCollections.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java | 10 ++++++++++
.../jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java | 10 ++++++++++
.../jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java | 10 ++++++++++
.../jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java | 10 ++++++++++
.../jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java | 10 ++++++++++
.../apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java | 10 ++++++++++
.../jdo/tck/pc/fieldtypes/MapStringValueCollections.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java | 10 ++++++++++
.../jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java | 10 ++++++++++
.../jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/AllPersist.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/AllPersist2.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/AllPersist3.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/AllPersist4.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/inheritance/Constants.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/FieldSameName.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/FieldSameName2.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/FieldSameName3.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/FieldSameName4.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopNonPersist.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistB.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistC.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistD.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistE.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistF.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistG.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopNonPersistH.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopPersist.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopPersistC.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopPersistD.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopPersistE.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopPersistF.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopPersistG.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/inheritance/TopPersistH.java | 10 ++++++++++
.../jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java | 10 ++++++++++
.../instancecallbacks/InstanceCallbackNonPersistFdsClass.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCClass.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRect.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/mylib/Point.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/mylib/VersionedPCPoint.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/newInstance/AAddress.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/newInstance/Address.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/newInstance/Address_bad.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/newInstance/IAddress.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/order/OrderFactory.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java | 2 +-
.../org/apache/jdo/tck/pc/order/OrderFactoryConcreteClass.java | 2 +-
.../java/org/apache/jdo/tck/pc/order/OrderFactoryPMClass.java | 2 +-
.../org/apache/jdo/tck/pc/order/OrderFactoryPMInterface.java | 2 +-
.../java/org/apache/jdo/tck/pc/order/OrderFactoryRegistry.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/order/OrderItem.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/order/OrderModelReader.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/query/JDOQLKeywordsAsFieldNames.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/query/MathSample.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/query/NamedQueriesSample.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/query/NoExtent.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/query/OptionalSample.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/query/TimeSample.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Cart.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/shoppingcart/CartEntry.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/shoppingcart/Undetachable.java | 10 ++++++++++
.../tck/pc/singlefieldidentity/AbstractPCPointSingleField.java | 10 ++++++++++
.../org/apache/jdo/tck/pc/singlefieldidentity/Employee.java | 10 ++++++++++
.../jdo/tck/pc/singlefieldidentity/FullTimeEmployee.java | 10 ++++++++++
.../jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java | 10 ++++++++++
.../pc/singlefieldidentity/PCPointSingleFieldCharacter.java | 10 ++++++++++
.../jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java | 10 ++++++++++
.../tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java | 10 ++++++++++
.../jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java | 10 ++++++++++
.../singlefieldidentity/PCPointSingleFieldPrimitivebyte.java | 10 ++++++++++
.../singlefieldidentity/PCPointSingleFieldPrimitivechar.java | 10 ++++++++++
.../pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java | 10 ++++++++++
.../singlefieldidentity/PCPointSingleFieldPrimitivelong.java | 10 ++++++++++
.../singlefieldidentity/PCPointSingleFieldPrimitiveshort.java | 10 ++++++++++
.../tck/pc/singlefieldidentity/PCPointSingleFieldShort.java | 10 ++++++++++
.../tck/pc/singlefieldidentity/PCPointSingleFieldString.java | 10 ++++++++++
.../jdo/tck/pc/singlefieldidentity/PartTimeEmployee.java | 10 ++++++++++
.../java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/QueryElementHolder.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/AutoCloseable.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/ChangeQuery.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/api/Close.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/api/CloseAll.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/CompileQuery.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/DeclareImports.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/DeclareParameters.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/DeclareVariables.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java | 10 ++++++++++
.../org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/GetFetchPlan.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/GetIgnoreCache.java | 10 ++++++++++
.../org/apache/jdo/tck/query/api/GetPersistenceManager.java | 10 ++++++++++
.../api/GetPersistenceManagerFromRestoredSerializedQuery.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/InvalidNamedQuery.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/NamedQueryNotFound.java | 10 ++++++++++
.../jdo/tck/query/api/NamedQueryRepeatableAnnotations.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/NewNamedQuery.java | 10 ++++++++++
.../api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java | 10 ++++++++++
.../jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java | 10 ++++++++++
.../org/apache/jdo/tck/query/api/NewQuerySingleString.java | 10 ++++++++++
.../apache/jdo/tck/query/api/NewQueryWithCandidateClass.java | 10 ++++++++++
.../tck/query/api/NewQueryWithCandidateClassAndCollection.java | 10 ++++++++++
.../jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java | 10 ++++++++++
.../jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java | 10 ++++++++++
.../query/api/NewQueryWithCandidateClassCollectionFilter.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java | 10 ++++++++++
.../apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java | 10 ++++++++++
.../tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/QueryCancel.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/QueryExtentions.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/SampleQueries.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java | 10 ++++++++++
.../org/apache/jdo/tck/query/api/SetCandidateCollection.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/SetCandidateExtent.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/api/SetFilter.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/SetGrouping.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/SetIgnoreCache.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/SetOrdering.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/api/SetRange.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/api/SetResultClass.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/api/SetUnique.java | 10 ++++++++++
.../apache/jdo/tck/query/api/SetterReplacePreviousValues.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/SingleStringQuery.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/delete/DeleteCallback.java | 10 ++++++++++
.../org/apache/jdo/tck/query/delete/DeletePersistentAll.java | 10 ++++++++++
.../org/apache/jdo/tck/query/delete/DeleteQueryElements.java | 10 ++++++++++
.../jdoql/AssignmentPrePostIncrementDecrementNotSupported.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java | 10 ++++++++++
.../jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java | 10 ++++++++++
.../jdoql/ComparingPersistentAndNonPersistentInstance.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java | 10 ++++++++++
.../jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java | 10 ++++++++++
.../ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java | 10 ++++++++++
.../ExecutingQueryWhenNoTransactionNoNontransactionalRead.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java | 10 ++++++++++
.../MultipleActiveQueryInstanceInSamePersistenceManager.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java | 10 ++++++++++
.../jdo/tck/query/jdoql/NavigationComparisonWithNull.java | 10 ++++++++++
.../jdo/tck/query/jdoql/NavigationThroughACollectionField.java | 10 ++++++++++
.../jdo/tck/query/jdoql/NavigationThroughANullValuedField.java | 10 ++++++++++
.../jdoql/NavigationThroughReferencesUsesDotOperator.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/jdoql/NegativeRange.java | 10 ++++++++++
.../jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/OrderingSpecification.java | 10 ++++++++++
.../jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/jdoql/PositiveRange.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java | 10 ++++++++++
.../jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/jdoql/RangeAsString.java | 10 ++++++++++
.../RestoredSerializedQueryInstanceLosesAssociationWithPM.java | 10 ++++++++++
.../jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java | 10 ++++++++++
.../jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java | 10 ++++++++++
.../jdo/tck/query/jdoql/keywords/InvalidUseOfKeywords.java | 10 ++++++++++
.../jdo/tck/query/jdoql/keywords/KeywordsAsFieldNames.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/keywords/SingleString.java | 10 ++++++++++
.../keywords/ThisIsReservedWordForElementOfCollection.java | 10 ++++++++++
.../jdo/tck/query/jdoql/keywords/UppercaseLowercase.java | 10 ++++++++++
.../tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java | 10 ++++++++++
.../methods/MethodsAndObjectConstructionNotSupported.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java | 10 ++++++++++
.../tck/query/jdoql/methods/SupportedCollectionMethods.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/SupportedDateMethods.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/SupportedListMethods.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/SupportedLocalDateMethods.java | 2 +-
.../tck/query/jdoql/methods/SupportedLocalDateTimeMethods.java | 2 +-
.../jdo/tck/query/jdoql/methods/SupportedLocalTimeMethods.java | 2 +-
.../jdo/tck/query/jdoql/methods/SupportedMapMethods.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/SupportedMathMethods.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/SupportedStringMethods.java | 10 ++++++++++
.../jdo/tck/query/jdoql/methods/SupportedTimeMethods.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/operators/BinaryAddition.java | 10 ++++++++++
.../jdo/tck/query/jdoql/operators/BinarySubtraction.java | 10 ++++++++++
.../jdo/tck/query/jdoql/operators/BitwiseBinaryOperators.java | 2 +-
.../jdo/tck/query/jdoql/operators/BitwiseComplement.java | 10 ++++++++++
.../jdo/tck/query/jdoql/operators/BooleanLogicalAND.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/operators/ComparisonTests.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/operators/ConditionalAND.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/operators/ConditionalOR.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/operators/Division.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/operators/Equality.java | 10 ++++++++++
.../EqualityAndComparisonsBetweenDateFieldsAndParameters.java | 10 ++++++++++
...lityAndComparisonsBetweenPrimitivesAndWrapperInstances.java | 10 ++++++++++
...EqualityAndComparisonsBetweenStringFieldsAndParameters.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java | 10 ++++++++++
.../jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/operators/Instanceof.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/operators/LessThan.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java | 10 ++++++++++
.../jdo/tck/query/jdoql/operators/LogicalComplement.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/operators/Multiplication.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/operators/NotEquals.java | 10 ++++++++++
.../tck/query/jdoql/operators/PromotionOfNumericOperands.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/operators/SignInversion.java | 10 ++++++++++
.../jdo/tck/query/jdoql/operators/StringConcatenation.java | 10 ++++++++++
.../org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java | 10 ++++++++++
.../jdo/tck/query/jdoql/parameters/BoundParameterCheck.java | 10 ++++++++++
.../tck/query/jdoql/parameters/DomainObjectsAsParameters.java | 10 ++++++++++
.../jdo/tck/query/jdoql/parameters/ImplicitParameters.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/parameters/MixedParameters.java | 10 ++++++++++
.../jdo/tck/query/jdoql/parameters/OrderOfParameters.java | 10 ++++++++++
.../query/jdoql/parameters/ParameterBoundToDifferentPM.java | 10 ++++++++++
.../ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java | 10 ++++++++++
.../query/jdoql/parameters/PrimitiveParameterPassedAsNull.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java | 10 ++++++++++
.../jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java | 10 ++++++++++
.../jdoql/subqueries/CorrelatedSubqueriesWithParameters.java | 10 ++++++++++
.../query/jdoql/subqueries/MultipleCallsReplaceSubquery.java | 10 ++++++++++
.../tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java | 10 ++++++++++
.../jdoql/subqueries/NullCandidateCollectionExpression.java | 10 ++++++++++
.../jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java | 10 ++++++++++
.../tck/query/jdoql/subqueries/NullVariableDeclaration.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/subqueries/SubqueriesTest.java | 10 ++++++++++
.../tck/query/jdoql/subqueries/UnmodifiedSubqueryInstance.java | 10 ++++++++++
.../apache/jdo/tck/query/jdoql/variables/MixedVariables.java | 10 ++++++++++
.../jdo/tck/query/jdoql/variables/UnconstrainedVariable.java | 10 ++++++++++
.../VariableDeclaredWithSameNameAsFieldOfCandidateClass.java | 10 ++++++++++
.../jdo/tck/query/jdoql/variables/VariablesAndFields.java | 10 ++++++++++
.../jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/AggregateResult.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/DefaultResult.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/DefaultUnique.java | 10 ++++++++++
.../jdo/tck/query/result/DistinctCandidateInstances.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/DistinctQuery.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/result/Grouping.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/IfElseResult.java | 10 ++++++++++
.../org/apache/jdo/tck/query/result/ImmutableQueryResult.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/MethodsInResult.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/NPEInResultExpr.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/result/NullResults.java | 10 ++++++++++
.../jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java | 10 ++++++++++
.../apache/jdo/tck/query/result/ResultClassRequirements.java | 10 ++++++++++
.../org/apache/jdo/tck/query/result/ResultExpressions.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/ShapeOfResult.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/VariableInResult.java | 10 ++++++++++
.../tck/query/result/VariableInResultMultipleNavigation.java | 10 ++++++++++
.../jdo/tck/query/result/VariableInResultNavigation.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/result/classes/FullName.java | 10 ++++++++++
.../org/apache/jdo/tck/query/result/classes/LongString.java | 10 ++++++++++
.../jdo/tck/query/result/classes/MissingNoArgsConstructor.java | 10 ++++++++++
.../apache/jdo/tck/query/result/classes/NoFieldsNoMethods.java | 10 ++++++++++
.../apache/jdo/tck/query/result/classes/PublicLongField.java | 10 ++++++++++
.../apache/jdo/tck/query/result/classes/PublicPutMethod.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/query/sql/NewQuery.java | 10 ++++++++++
.../java/org/apache/jdo/tck/query/sql/NoCandidateClass.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java | 10 ++++++++++
.../transactions/AfterCompletionMethodCalledWhenCommitted.java | 10 ++++++++++
.../AfterCompletionMethodCalledWhenRolledback.java | 10 ++++++++++
.../jdo/tck/transactions/AfterSetRollbackOnlyCommitFails.java | 2 +-
.../jdo/tck/transactions/BeforeCompletionMethodCalled.java | 10 ++++++++++
.../BeforeCompletionMethodNotCalledBeforeRollback.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/transactions/Commit.java | 10 ++++++++++
.../org/apache/jdo/tck/transactions/GetPersistenceManager.java | 10 ++++++++++
.../java/org/apache/jdo/tck/transactions/GetRetainValues.java | 10 ++++++++++
.../tck/transactions/GetRollbackOnlyReturnsFalseUntilSet.java | 10 ++++++++++
.../org/apache/jdo/tck/transactions/GetSynchronization.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/transactions/IsActive.java | 10 ++++++++++
.../transactions/IsActiveUntilAfterCompletionMethodCalled.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/transactions/Rollback.java | 10 ++++++++++
.../org/apache/jdo/tck/transactions/SetIsolationLevel.java | 10 ++++++++++
.../apache/jdo/tck/transactions/SetNontransactionalRead.java | 10 ++++++++++
.../SetNontransactionalReadCalledDuringTxCompletion.java | 10 ++++++++++
.../SetNontransactionalReadTrueWhenNotSupported.java | 10 ++++++++++
.../SetNontransactionalWriteCalledDuringTxCompletion.java | 10 ++++++++++
.../java/org/apache/jdo/tck/transactions/SetOptimistic.java | 10 ++++++++++
.../transactions/SetOptimisticCalledDuringTxCompletion.java | 10 ++++++++++
.../jdo/tck/transactions/SetOptimisticDuringTransaction.java | 10 ++++++++++
.../tck/transactions/SetOptimisticTrueWhenNotSupported.java | 10 ++++++++++
.../java/org/apache/jdo/tck/transactions/SetRetainValues.java | 10 ++++++++++
.../transactions/SetRetainValuesCalledDuringTxCompletion.java | 10 ++++++++++
.../tck/transactions/SetRetainValuesTrueWhenNotSupported.java | 10 ++++++++++
.../org/apache/jdo/tck/transactions/SetSynchronization.java | 10 ++++++++++
.../apache/jdo/tck/transactions/SetSynchronizationToNull.java | 10 ++++++++++
.../jdo/tck/transactions/WhenNontransactionalReadIsFalse.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/util/BatchResultPrinter.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/util/BatchTestRunner.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/util/ClassGenerator.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/util/ConsoleFileOutput.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/util/ConversionHelper.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/util/DeepEquality.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/util/GetSupportedOptions.java | 10 ++++++++++
.../java/org/apache/jdo/tck/util/IntegerToStringConverter.java | 2 +-
.../main/java/org/apache/jdo/tck/util/JDOCustomDateEditor.java | 2 +-
tck/src/main/java/org/apache/jdo/tck/util/JDOJdk14Logger.java | 10 ++++++++++
.../java/org/apache/jdo/tck/util/PointToStringConverter.java | 2 +-
tck/src/main/java/org/apache/jdo/tck/util/ResultSummary.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/util/RogueBarrier.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/util/SystemCfgSummary.java | 10 ++++++++++
tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java | 10 ++++++++++
.../java/org/apache/jdo/tck/util/ThreadExceptionHandler.java | 10 ++++++++++
.../main/java/org/apache/jdo/tck/util/signature/Formatter.java | 10 ++++++++++
.../org/apache/jdo/tck/util/signature/SignatureVerifier.java | 10 ++++++++++
.../java/org/apache/jdo/tck/util/signature/TypeHelper.java | 10 ++++++++++
tck/src/main/resources/conf/applicationidentity.conf | 2 +-
tck/src/main/resources/conf/commons-logging.properties | 2 +-
tck/src/main/resources/conf/company1-1Relationships.conf | 2 +-
tck/src/main/resources/conf/company1-MRelationships.conf | 2 +-
tck/src/main/resources/conf/companyAllRelationships.conf | 2 +-
.../resources/conf/companyAnnotated1-1RelationshipsFCPM.conf | 2 +-
.../resources/conf/companyAnnotated1-MRelationshipsFCPM.conf | 2 +-
.../conf/companyAnnotatedAllRelationshipsFCConcrete.conf | 2 +-
.../resources/conf/companyAnnotatedAllRelationshipsFCPM.conf | 2 +-
.../conf/companyAnnotatedAllRelationshipsJPAConcrete.conf | 2 +-
.../resources/conf/companyAnnotatedAllRelationshipsJPAPM.conf | 2 +-
.../conf/companyAnnotatedAllRelationshipsPCConcrete.conf | 2 +-
.../resources/conf/companyAnnotatedAllRelationshipsPCPM.conf | 2 +-
.../resources/conf/companyAnnotatedAllRelationshipsPIPM.conf | 2 +-
tck/src/main/resources/conf/companyAnnotatedEmbeddedFCPM.conf | 2 +-
.../resources/conf/companyAnnotatedEmbeddedJPAConcrete.conf | 2 +-
tck/src/main/resources/conf/companyAnnotatedEmbeddedJPAPM.conf | 2 +-
.../conf/companyAnnotatedM-MRelationshipsFCConcrete.conf | 2 +-
.../resources/conf/companyAnnotatedM-MRelationshipsFCPM.conf | 2 +-
.../conf/companyAnnotatedNoRelationshipsFCConcrete.conf | 2 +-
.../resources/conf/companyAnnotatedNoRelationshipsFCPM.conf | 2 +-
.../conf/companyAnnotatedNoRelationshipsPCConcrete.conf | 2 +-
.../resources/conf/companyAnnotatedNoRelationshipsPCPM.conf | 2 +-
.../resources/conf/companyAnnotatedNoRelationshipsPIPM.conf | 2 +-
tck/src/main/resources/conf/companyEmbedded.conf | 2 +-
tck/src/main/resources/conf/companyListWithoutJoin.conf | 2 +-
tck/src/main/resources/conf/companyM-MRelationships.conf | 2 +-
tck/src/main/resources/conf/companyMapWithoutJoin.conf | 2 +-
tck/src/main/resources/conf/companyNoRelationships.conf | 2 +-
.../conf/companyOverrideAnnotatedAllRelationshipsFCPM.conf | 2 +-
tck/src/main/resources/conf/companyPMClass.conf | 2 +-
tck/src/main/resources/conf/companyPMInterface.conf | 2 +-
tck/src/main/resources/conf/compoundIdentity.conf | 2 +-
tck/src/main/resources/conf/configurations.list | 2 +-
tck/src/main/resources/conf/converter.conf | 2 +-
tck/src/main/resources/conf/datastoreidentity.conf | 2 +-
tck/src/main/resources/conf/derby.properties | 2 +-
tck/src/main/resources/conf/detach.conf | 2 +-
tck/src/main/resources/conf/detach.list | 2 +-
tck/src/main/resources/conf/embeddedInheritance.conf | 2 +-
tck/src/main/resources/conf/enhancement-test.properties | 2 +-
tck/src/main/resources/conf/enhancement.conf | 2 +-
tck/src/main/resources/conf/exclude.list | 2 +-
tck/src/main/resources/conf/extents.conf | 2 +-
tck/src/main/resources/conf/fetchgroup.conf | 2 +-
tck/src/main/resources/conf/fetchplan.conf | 2 +-
tck/src/main/resources/conf/inheritance1.conf | 2 +-
tck/src/main/resources/conf/inheritance2.conf | 2 +-
tck/src/main/resources/conf/inheritance3.conf | 2 +-
tck/src/main/resources/conf/inheritance4.conf | 2 +-
tck/src/main/resources/conf/instancecallbacks.conf | 2 +-
tck/src/main/resources/conf/iut-jdoconfig.xml | 2 +-
tck/src/main/resources/conf/iut-log4j.properties | 2 +-
tck/src/main/resources/conf/iut-log4j2.xml | 2 +-
tck/src/main/resources/conf/iut-persistence.xml | 2 +-
tck/src/main/resources/conf/iut-pmf.properties | 2 +-
tck/src/main/resources/conf/jdo-signatures.txt | 2 +-
tck/src/main/resources/conf/jdohelper.conf | 2 +-
tck/src/main/resources/conf/jdoql.conf | 2 +-
tck/src/main/resources/conf/jdoql1.conf | 2 +-
tck/src/main/resources/conf/jdori-jdoconfig.xml | 2 +-
tck/src/main/resources/conf/jdori-log4j2.xml | 2 +-
tck/src/main/resources/conf/jdori-persistence.xml | 2 +-
tck/src/main/resources/conf/jdori-pmf.properties | 2 +-
tck/src/main/resources/conf/jndi.properties | 2 +-
tck/src/main/resources/conf/lifecycle.conf | 2 +-
tck/src/main/resources/conf/logging.properties | 2 +-
tck/src/main/resources/conf/models.conf | 2 +-
tck/src/main/resources/conf/models1.conf | 2 +-
tck/src/main/resources/conf/pm.conf | 2 +-
tck/src/main/resources/conf/pmf.conf | 2 +-
tck/src/main/resources/conf/query.conf | 2 +-
tck/src/main/resources/conf/relationshipAllRelationships.conf | 2 +-
tck/src/main/resources/conf/relationshipNoRelationships.conf | 2 +-
tck/src/main/resources/conf/runonce.conf | 2 +-
tck/src/main/resources/conf/schemaAttributeClass.conf | 2 +-
tck/src/main/resources/conf/schemaAttributeOrm.conf | 2 +-
tck/src/main/resources/conf/schemaAttributePackage.conf | 2 +-
tck/src/main/resources/conf/security.conf | 2 +-
tck/src/main/resources/conf/security.policy | 2 +-
tck/src/main/resources/conf/simplelog.properties | 2 +-
.../main/resources/conf/throwOnUnknownStandardProperties.conf | 2 +-
tck/src/main/resources/conf/transactions.conf | 2 +-
.../org/apache/jdo/tck/api/instancecallbacks/package.jdo | 2 +-
.../jdo/applicationidentity/org/apache/jdo/tck/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/building/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/company/Person.jdoquery | 2 +-
.../org/apache/jdo/tck/pc/company/jdoTest.properties | 2 +-
.../org/apache/jdo/tck/pc/company/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/converter/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/inheritance/jdoTest.properties | 2 +-
.../org/apache/jdo/tck/pc/inheritance/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/instancecallbacks/jdoTest.properties | 2 +-
.../org/apache/jdo/tck/pc/instancecallbacks/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo | 2 +-
.../org/apache/jdo/tck/pc/mylib/PCClass.jdo | 2 +-
.../org/apache/jdo/tck/pc/mylib/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/AAddress.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/Address.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/Address_bad.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/IAddress.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo | 2 +-
.../org/apache/jdo/tck/pc/order/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/query/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/shoppingcart/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/singlefieldidentity/package.jdo | 2 +-
tck/src/main/resources/jdo/applicationidentity/package.jdo | 2 +-
.../org/apache/jdo/tck/api/instancecallbacks/package.jdo | 2 +-
.../jdo/datastoreidentity/org/apache/jdo/tck/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/building/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/company/Person.jdoquery | 2 +-
.../org/apache/jdo/tck/pc/company/jdoTest.properties | 2 +-
.../org/apache/jdo/tck/pc/company/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/converter/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo | 2 +-
.../apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo | 2 +-
.../jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo | 2 +-
.../org/apache/jdo/tck/pc/inheritance/jdoTest.properties | 2 +-
.../org/apache/jdo/tck/pc/inheritance/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/instancecallbacks/jdoTest.properties | 2 +-
.../org/apache/jdo/tck/pc/instancecallbacks/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo | 2 +-
.../datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo | 2 +-
.../datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/AAddress.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/Address.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/Address_bad.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/IAddress.jdo | 2 +-
.../org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo | 2 +-
.../datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo | 2 +-
.../datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/shoppingcart/package.jdo | 2 +-
.../org/apache/jdo/tck/pc/singlefieldidentity/package.jdo | 2 +-
tck/src/main/resources/jdo/datastoreidentity/package.jdo | 2 +-
.../apache/jdo/tck/api/instancecallbacks/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/building/package-standard12.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard1.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard2.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard3.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard4.orm | 2 +-
.../jdo/tck/pc/companyAnnotatedFC/package-standard11.orm | 2 +-
.../jdo/tck/pc/companyListWithoutJoin/package-standard10.orm | 2 +-
.../jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm | 2 +-
.../org/apache/jdo/tck/pc/converter/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm | 2 +-
.../tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm | 2 +-
.../tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm | 2 +-
.../pc/fieldtypes/HashMapStringValueCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm | 2 +-
.../pc/fieldtypes/HashtableStringKeyCollections-standard.orm | 2 +-
.../pc/fieldtypes/HashtableStringValueCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm | 2 +-
.../tck/pc/fieldtypes/MapStringValueCollections-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm | 2 +-
.../tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm | 2 +-
.../pc/fieldtypes/TreeMapStringValueCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/VectorCollections-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/inheritance/package-standard.orm | 2 +-
.../apache/jdo/tck/pc/instancecallbacks/package-standard.orm | 2 +-
.../jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/mylib/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/mylib/package-standard5.orm | 2 +-
.../org/apache/jdo/tck/pc/mylib/package-standard6.orm | 2 +-
.../org/apache/jdo/tck/pc/mylib/package-standard7.orm | 2 +-
.../org/apache/jdo/tck/pc/newInstance/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/order/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/query/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm | 2 +-
.../apache/jdo/tck/pc/singlefieldidentity/package-standard.orm | 2 +-
.../apache/jdo/tck/api/instancecallbacks/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/building/package-standard12.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard1.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard2.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard3.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard4.orm | 2 +-
.../jdo/tck/pc/companyAnnotatedFC/package-standard11.orm | 2 +-
.../jdo/tck/pc/companyListWithoutJoin/package-standard10.orm | 2 +-
.../jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm | 2 +-
.../org/apache/jdo/tck/pc/converter/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm | 2 +-
.../tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm | 2 +-
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm | 2 +-
.../tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm | 2 +-
.../pc/fieldtypes/HashMapStringValueCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm | 2 +-
.../pc/fieldtypes/HashtableStringKeyCollections-standard.orm | 2 +-
.../pc/fieldtypes/HashtableStringValueCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm | 2 +-
.../tck/pc/fieldtypes/MapStringValueCollections-standard.orm | 2 +-
.../apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm | 2 +-
.../tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm | 2 +-
.../pc/fieldtypes/TreeMapStringValueCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm | 2 +-
.../jdo/tck/pc/fieldtypes/VectorCollections-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/inheritance/package-standard.orm | 2 +-
.../apache/jdo/tck/pc/instancecallbacks/package-standard.orm | 2 +-
.../jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/mylib/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/mylib/package-standard5.orm | 2 +-
.../org/apache/jdo/tck/pc/mylib/package-standard6.orm | 2 +-
.../org/apache/jdo/tck/pc/mylib/package-standard7.orm | 2 +-
.../org/apache/jdo/tck/pc/newInstance/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/query/package-standard.orm | 2 +-
.../org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm | 2 +-
.../main/resources/sql/derby/applicationidentity/schema.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema1.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema10.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema11.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema12.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema2.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema3.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema4.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema5.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema6.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema7.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema8.sql | 2 +-
.../main/resources/sql/derby/applicationidentity/schema9.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema1.sql | 2 +-
.../main/resources/sql/derby/datastoreidentity/schema10.sql | 2 +-
.../main/resources/sql/derby/datastoreidentity/schema11.sql | 2 +-
.../main/resources/sql/derby/datastoreidentity/schema12.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema2.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema3.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema4.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema5.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema6.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema7.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema8.sql | 2 +-
tck/src/main/resources/sql/derby/datastoreidentity/schema9.sql | 2 +-
.../org/apache/jdo/tck/pc/company/company1-1Relationships.xml | 2 +-
.../org/apache/jdo/tck/pc/company/company1-MRelationships.xml | 2 +-
.../org/apache/jdo/tck/pc/company/companyAllRelationships.xml | 2 +-
.../testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml | 2 +-
.../apache/jdo/tck/pc/company/companyForNavigationTests.xml | 2 +-
.../org/apache/jdo/tck/pc/company/companyForQueryTests.xml | 2 +-
.../apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml | 2 +-
.../apache/jdo/tck/pc/company/companyForSubqueriesTests.xml | 2 +-
.../org/apache/jdo/tck/pc/company/companyM-MRelationships.xml | 2 +-
.../org/apache/jdo/tck/pc/company/companyNoRelationships.xml | 2 +-
.../tck/pc/companyListWithoutJoin/companyListWithoutJoin.xml | 2 +-
.../jdo/tck/pc/companyMapWithoutJoin/companyMapWithoutJoin.xml | 2 +-
.../org/apache/jdo/tck/pc/mylib/mylibForQueryTests.xml | 2 +-
.../resources/testdata/org/apache/jdo/tck/pc/order/order.xml | 2 +-
.../org/apache/jdo/tck/pc/shoppingcart/shoppingcart.argo.uml | 2 +-
1477 files changed, 9949 insertions(+), 535 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index dd4f1c3e..952819b3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7b631ab6..d60890da 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/.rat-excludes b/.rat-excludes
index fcf26d6d..ab6219d7 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -5,7 +5,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/HowToReleaseJDO.md b/HowToReleaseJDO.md
index f8306169..02b57644 100644
--- a/HowToReleaseJDO.md
+++ b/HowToReleaseJDO.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/LICENSE b/LICENSE
index ff9ad453..62589edd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
Apache License
Version 2.0, January 2004
- http://www.apache.org/licenses/
+ https://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
diff --git a/api/src/main/java/javax/jdo/Extent.java b/api/src/main/java/javax/jdo/Extent.java
index ace1c2e6..291aa393 100644
--- a/api/src/main/java/javax/jdo/Extent.java
+++ b/api/src/main/java/javax/jdo/Extent.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/FetchGroup.java b/api/src/main/java/javax/jdo/FetchGroup.java
index 1661e059..777df745 100644
--- a/api/src/main/java/javax/jdo/FetchGroup.java
+++ b/api/src/main/java/javax/jdo/FetchGroup.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/FetchPlan.java b/api/src/main/java/javax/jdo/FetchPlan.java
index 0c9cc74d..f4230e2d 100644
--- a/api/src/main/java/javax/jdo/FetchPlan.java
+++ b/api/src/main/java/javax/jdo/FetchPlan.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/InstanceCallbacks.java b/api/src/main/java/javax/jdo/InstanceCallbacks.java
index 2aad32ab..3988082c 100644
--- a/api/src/main/java/javax/jdo/InstanceCallbacks.java
+++ b/api/src/main/java/javax/jdo/InstanceCallbacks.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOCanRetryException.java b/api/src/main/java/javax/jdo/JDOCanRetryException.java
index 59d10e5a..9e17b391 100644
--- a/api/src/main/java/javax/jdo/JDOCanRetryException.java
+++ b/api/src/main/java/javax/jdo/JDOCanRetryException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDODataStoreException.java b/api/src/main/java/javax/jdo/JDODataStoreException.java
index b08c4703..36852b33 100644
--- a/api/src/main/java/javax/jdo/JDODataStoreException.java
+++ b/api/src/main/java/javax/jdo/JDODataStoreException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java b/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
index 72fd5b2e..3b2421bb 100644
--- a/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
+++ b/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOException.java b/api/src/main/java/javax/jdo/JDOException.java
index 923af197..f1e0adf3 100644
--- a/api/src/main/java/javax/jdo/JDOException.java
+++ b/api/src/main/java/javax/jdo/JDOException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java b/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
index feb72f78..c6809ee6 100644
--- a/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOFatalException.java b/api/src/main/java/javax/jdo/JDOFatalException.java
index eb39889e..c3c2cad9 100644
--- a/api/src/main/java/javax/jdo/JDOFatalException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOFatalInternalException.java b/api/src/main/java/javax/jdo/JDOFatalInternalException.java
index b239d638..520b89fd 100644
--- a/api/src/main/java/javax/jdo/JDOFatalInternalException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalInternalException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOFatalUserException.java b/api/src/main/java/javax/jdo/JDOFatalUserException.java
index f43cfd2c..946b64cb 100644
--- a/api/src/main/java/javax/jdo/JDOFatalUserException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalUserException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOHelper.java b/api/src/main/java/javax/jdo/JDOHelper.java
index f1103aef..977b8247 100644
--- a/api/src/main/java/javax/jdo/JDOHelper.java
+++ b/api/src/main/java/javax/jdo/JDOHelper.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDONullIdentityException.java b/api/src/main/java/javax/jdo/JDONullIdentityException.java
index 5add98f5..684e4828 100644
--- a/api/src/main/java/javax/jdo/JDONullIdentityException.java
+++ b/api/src/main/java/javax/jdo/JDONullIdentityException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOObjectNotFoundException.java b/api/src/main/java/javax/jdo/JDOObjectNotFoundException.java
index 0ef7ef24..5c7c2ff8 100644
--- a/api/src/main/java/javax/jdo/JDOObjectNotFoundException.java
+++ b/api/src/main/java/javax/jdo/JDOObjectNotFoundException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOOptimisticVerificationException.java b/api/src/main/java/javax/jdo/JDOOptimisticVerificationException.java
index 69d8dd99..dea023b8 100644
--- a/api/src/main/java/javax/jdo/JDOOptimisticVerificationException.java
+++ b/api/src/main/java/javax/jdo/JDOOptimisticVerificationException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOQLTypedQuery.java b/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
index d787ec0a..9dd6146d 100644
--- a/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
+++ b/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo;
diff --git a/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java b/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
index dff6381a..1ac1a42f 100644
--- a/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
+++ b/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo;
diff --git a/api/src/main/java/javax/jdo/JDOQueryInterruptedException.java b/api/src/main/java/javax/jdo/JDOQueryInterruptedException.java
index 3dc3ed8f..3ec5fa64 100644
--- a/api/src/main/java/javax/jdo/JDOQueryInterruptedException.java
+++ b/api/src/main/java/javax/jdo/JDOQueryInterruptedException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOReadOnlyException.java b/api/src/main/java/javax/jdo/JDOReadOnlyException.java
index 0e5c5a48..96fadbbc 100644
--- a/api/src/main/java/javax/jdo/JDOReadOnlyException.java
+++ b/api/src/main/java/javax/jdo/JDOReadOnlyException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java b/api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java
index 6e5391dc..34b39370 100644
--- a/api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java
+++ b/api/src/main/java/javax/jdo/JDOUnsupportedOptionException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOUserCallbackException.java b/api/src/main/java/javax/jdo/JDOUserCallbackException.java
index 352ada11..d5e7cf16 100644
--- a/api/src/main/java/javax/jdo/JDOUserCallbackException.java
+++ b/api/src/main/java/javax/jdo/JDOUserCallbackException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/JDOUserException.java b/api/src/main/java/javax/jdo/JDOUserException.java
index 70da645e..950d701f 100644
--- a/api/src/main/java/javax/jdo/JDOUserException.java
+++ b/api/src/main/java/javax/jdo/JDOUserException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/PersistenceManager.java b/api/src/main/java/javax/jdo/PersistenceManager.java
index e60b6a0e..805d2ba0 100644
--- a/api/src/main/java/javax/jdo/PersistenceManager.java
+++ b/api/src/main/java/javax/jdo/PersistenceManager.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/Query.java b/api/src/main/java/javax/jdo/Query.java
index 674348aa..2732eca3 100644
--- a/api/src/main/java/javax/jdo/Query.java
+++ b/api/src/main/java/javax/jdo/Query.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/Transaction.java b/api/src/main/java/javax/jdo/Transaction.java
index 0482ce77..bb42b3d5 100644
--- a/api/src/main/java/javax/jdo/Transaction.java
+++ b/api/src/main/java/javax/jdo/Transaction.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/datastore/DataStoreCache.java b/api/src/main/java/javax/jdo/datastore/DataStoreCache.java
index d6d08501..5a463e24 100644
--- a/api/src/main/java/javax/jdo/datastore/DataStoreCache.java
+++ b/api/src/main/java/javax/jdo/datastore/DataStoreCache.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/datastore/JDOConnection.java b/api/src/main/java/javax/jdo/datastore/JDOConnection.java
index 19918b10..c72d9835 100644
--- a/api/src/main/java/javax/jdo/datastore/JDOConnection.java
+++ b/api/src/main/java/javax/jdo/datastore/JDOConnection.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/datastore/Sequence.java b/api/src/main/java/javax/jdo/datastore/Sequence.java
index 44eb7675..36d620c6 100644
--- a/api/src/main/java/javax/jdo/datastore/Sequence.java
+++ b/api/src/main/java/javax/jdo/datastore/Sequence.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/identity/ByteIdentity.java b/api/src/main/java/javax/jdo/identity/ByteIdentity.java
index 42d04b2b..77f4793c 100644
--- a/api/src/main/java/javax/jdo/identity/ByteIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/ByteIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/identity/CharIdentity.java b/api/src/main/java/javax/jdo/identity/CharIdentity.java
index 59bd5eea..0c71b511 100644
--- a/api/src/main/java/javax/jdo/identity/CharIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/CharIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/identity/IntIdentity.java b/api/src/main/java/javax/jdo/identity/IntIdentity.java
index 5f973cd2..3b1d4aa7 100644
--- a/api/src/main/java/javax/jdo/identity/IntIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/IntIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/identity/LongIdentity.java b/api/src/main/java/javax/jdo/identity/LongIdentity.java
index 667a3fab..e2876813 100644
--- a/api/src/main/java/javax/jdo/identity/LongIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/LongIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/identity/ObjectIdentity.java b/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
index bd144e5d..52988e49 100644
--- a/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/identity/ShortIdentity.java b/api/src/main/java/javax/jdo/identity/ShortIdentity.java
index 1c4cbf6c..ad3281f0 100644
--- a/api/src/main/java/javax/jdo/identity/ShortIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/ShortIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java b/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
index ef8e247e..e248a093 100644
--- a/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/identity/StringIdentity.java b/api/src/main/java/javax/jdo/identity/StringIdentity.java
index 5bf7dd98..9bef729d 100644
--- a/api/src/main/java/javax/jdo/identity/StringIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/StringIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/AttachCallback.java b/api/src/main/java/javax/jdo/listener/AttachCallback.java
index a43bee3a..efa569e4 100644
--- a/api/src/main/java/javax/jdo/listener/AttachCallback.java
+++ b/api/src/main/java/javax/jdo/listener/AttachCallback.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/AttachLifecycleListener.java b/api/src/main/java/javax/jdo/listener/AttachLifecycleListener.java
index c0423e1c..4681180e 100644
--- a/api/src/main/java/javax/jdo/listener/AttachLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/AttachLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/ClearCallback.java b/api/src/main/java/javax/jdo/listener/ClearCallback.java
index 11a72d49..c822f50b 100644
--- a/api/src/main/java/javax/jdo/listener/ClearCallback.java
+++ b/api/src/main/java/javax/jdo/listener/ClearCallback.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java b/api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java
index 6c360c21..53ae349a 100644
--- a/api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/ClearLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/CreateLifecycleListener.java b/api/src/main/java/javax/jdo/listener/CreateLifecycleListener.java
index ebd1ed0d..0ea83b84 100644
--- a/api/src/main/java/javax/jdo/listener/CreateLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/CreateLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/DeleteCallback.java b/api/src/main/java/javax/jdo/listener/DeleteCallback.java
index 6283ca2d..4b8dd547 100644
--- a/api/src/main/java/javax/jdo/listener/DeleteCallback.java
+++ b/api/src/main/java/javax/jdo/listener/DeleteCallback.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/DeleteLifecycleListener.java b/api/src/main/java/javax/jdo/listener/DeleteLifecycleListener.java
index d90eb595..ca79d73f 100644
--- a/api/src/main/java/javax/jdo/listener/DeleteLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/DeleteLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/DetachCallback.java b/api/src/main/java/javax/jdo/listener/DetachCallback.java
index 8beccf09..95f9ce4c 100644
--- a/api/src/main/java/javax/jdo/listener/DetachCallback.java
+++ b/api/src/main/java/javax/jdo/listener/DetachCallback.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/DetachLifecycleListener.java b/api/src/main/java/javax/jdo/listener/DetachLifecycleListener.java
index f239efbe..beaecfbd 100644
--- a/api/src/main/java/javax/jdo/listener/DetachLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/DetachLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java b/api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java
index 39c9ce58..51308046 100644
--- a/api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/DirtyLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java b/api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java
index 3348a84b..bfe187ec 100644
--- a/api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java
+++ b/api/src/main/java/javax/jdo/listener/InstanceLifecycleEvent.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/InstanceLifecycleListener.java b/api/src/main/java/javax/jdo/listener/InstanceLifecycleListener.java
index 58aeb97b..1cacfd3e 100644
--- a/api/src/main/java/javax/jdo/listener/InstanceLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/InstanceLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/LoadCallback.java b/api/src/main/java/javax/jdo/listener/LoadCallback.java
index cbe630d0..93efa773 100644
--- a/api/src/main/java/javax/jdo/listener/LoadCallback.java
+++ b/api/src/main/java/javax/jdo/listener/LoadCallback.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java b/api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java
index 2bd8d9ce..be04d0dd 100644
--- a/api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/LoadLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/StoreCallback.java b/api/src/main/java/javax/jdo/listener/StoreCallback.java
index 31153bd4..dee47d56 100644
--- a/api/src/main/java/javax/jdo/listener/StoreCallback.java
+++ b/api/src/main/java/javax/jdo/listener/StoreCallback.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java b/api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java
index ac9232f8..e0d17a9c 100644
--- a/api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java
+++ b/api/src/main/java/javax/jdo/listener/StoreLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/query/BooleanExpression.java b/api/src/main/java/javax/jdo/query/BooleanExpression.java
index d49f4306..e0524ff9 100644
--- a/api/src/main/java/javax/jdo/query/BooleanExpression.java
+++ b/api/src/main/java/javax/jdo/query/BooleanExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/ByteExpression.java b/api/src/main/java/javax/jdo/query/ByteExpression.java
index 1a99f21f..ab269fe0 100644
--- a/api/src/main/java/javax/jdo/query/ByteExpression.java
+++ b/api/src/main/java/javax/jdo/query/ByteExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/CharacterExpression.java b/api/src/main/java/javax/jdo/query/CharacterExpression.java
index 33b7c155..42f99a2b 100644
--- a/api/src/main/java/javax/jdo/query/CharacterExpression.java
+++ b/api/src/main/java/javax/jdo/query/CharacterExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/CollectionExpression.java b/api/src/main/java/javax/jdo/query/CollectionExpression.java
index b3bc194f..52b1d018 100644
--- a/api/src/main/java/javax/jdo/query/CollectionExpression.java
+++ b/api/src/main/java/javax/jdo/query/CollectionExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/ComparableExpression.java b/api/src/main/java/javax/jdo/query/ComparableExpression.java
index b51479b4..74a31298 100644
--- a/api/src/main/java/javax/jdo/query/ComparableExpression.java
+++ b/api/src/main/java/javax/jdo/query/ComparableExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/DateExpression.java b/api/src/main/java/javax/jdo/query/DateExpression.java
index 00a08ac1..655b8168 100644
--- a/api/src/main/java/javax/jdo/query/DateExpression.java
+++ b/api/src/main/java/javax/jdo/query/DateExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/DateTimeExpression.java b/api/src/main/java/javax/jdo/query/DateTimeExpression.java
index 23cbcfd1..79fae62c 100644
--- a/api/src/main/java/javax/jdo/query/DateTimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/DateTimeExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/EnumExpression.java b/api/src/main/java/javax/jdo/query/EnumExpression.java
index 58d5f962..e4d03e22 100644
--- a/api/src/main/java/javax/jdo/query/EnumExpression.java
+++ b/api/src/main/java/javax/jdo/query/EnumExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/Expression.java b/api/src/main/java/javax/jdo/query/Expression.java
index 73133c29..d3383f8a 100644
--- a/api/src/main/java/javax/jdo/query/Expression.java
+++ b/api/src/main/java/javax/jdo/query/Expression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/ListExpression.java b/api/src/main/java/javax/jdo/query/ListExpression.java
index 09fc173c..07a55ed0 100644
--- a/api/src/main/java/javax/jdo/query/ListExpression.java
+++ b/api/src/main/java/javax/jdo/query/ListExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/LocalDateExpression.java b/api/src/main/java/javax/jdo/query/LocalDateExpression.java
index 7be4b83e..6a895efe 100644
--- a/api/src/main/java/javax/jdo/query/LocalDateExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalDateExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java b/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
index 2c40184f..a3a6358a 100644
--- a/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/LocalTimeExpression.java b/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
index 994fd9ed..9e5a01b3 100644
--- a/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/MapExpression.java b/api/src/main/java/javax/jdo/query/MapExpression.java
index 964ba390..d4cbc1a3 100644
--- a/api/src/main/java/javax/jdo/query/MapExpression.java
+++ b/api/src/main/java/javax/jdo/query/MapExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/NumericExpression.java b/api/src/main/java/javax/jdo/query/NumericExpression.java
index f3270593..2fafd18f 100644
--- a/api/src/main/java/javax/jdo/query/NumericExpression.java
+++ b/api/src/main/java/javax/jdo/query/NumericExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/ObjectExpression.java b/api/src/main/java/javax/jdo/query/ObjectExpression.java
index 41411887..78c1e706 100644
--- a/api/src/main/java/javax/jdo/query/ObjectExpression.java
+++ b/api/src/main/java/javax/jdo/query/ObjectExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/OptionalExpression.java b/api/src/main/java/javax/jdo/query/OptionalExpression.java
index aa0f64f7..8d5d1bf1 100644
--- a/api/src/main/java/javax/jdo/query/OptionalExpression.java
+++ b/api/src/main/java/javax/jdo/query/OptionalExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/OrderExpression.java b/api/src/main/java/javax/jdo/query/OrderExpression.java
index 62a25a31..9efafa44 100644
--- a/api/src/main/java/javax/jdo/query/OrderExpression.java
+++ b/api/src/main/java/javax/jdo/query/OrderExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/PersistableExpression.java b/api/src/main/java/javax/jdo/query/PersistableExpression.java
index 7ca0fada..7d2a5e3e 100644
--- a/api/src/main/java/javax/jdo/query/PersistableExpression.java
+++ b/api/src/main/java/javax/jdo/query/PersistableExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/StringExpression.java b/api/src/main/java/javax/jdo/query/StringExpression.java
index 52663639..d986b943 100644
--- a/api/src/main/java/javax/jdo/query/StringExpression.java
+++ b/api/src/main/java/javax/jdo/query/StringExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/SubqueryExpression.java b/api/src/main/java/javax/jdo/query/SubqueryExpression.java
index e707bd41..0d8c2d11 100644
--- a/api/src/main/java/javax/jdo/query/SubqueryExpression.java
+++ b/api/src/main/java/javax/jdo/query/SubqueryExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/query/TimeExpression.java b/api/src/main/java/javax/jdo/query/TimeExpression.java
index 297214b7..73601939 100644
--- a/api/src/main/java/javax/jdo/query/TimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/TimeExpression.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo.query;
diff --git a/api/src/main/java/javax/jdo/spi/Detachable.java b/api/src/main/java/javax/jdo/spi/Detachable.java
index 749838c9..c166aff0 100644
--- a/api/src/main/java/javax/jdo/spi/Detachable.java
+++ b/api/src/main/java/javax/jdo/spi/Detachable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/spi/I18NHelper.java b/api/src/main/java/javax/jdo/spi/I18NHelper.java
index fa3ce235..f18c46f6 100644
--- a/api/src/main/java/javax/jdo/spi/I18NHelper.java
+++ b/api/src/main/java/javax/jdo/spi/I18NHelper.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/spi/JDOImplHelper.java b/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
index a6c84bef..6eb93897 100644
--- a/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
+++ b/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/spi/JDOPermission.java b/api/src/main/java/javax/jdo/spi/JDOPermission.java
index 469bf65e..bf22a1b2 100644
--- a/api/src/main/java/javax/jdo/spi/JDOPermission.java
+++ b/api/src/main/java/javax/jdo/spi/JDOPermission.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/spi/PersistenceCapable.java b/api/src/main/java/javax/jdo/spi/PersistenceCapable.java
index f27458e8..1d5ecfec 100644
--- a/api/src/main/java/javax/jdo/spi/PersistenceCapable.java
+++ b/api/src/main/java/javax/jdo/spi/PersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/spi/RegisterClassEvent.java b/api/src/main/java/javax/jdo/spi/RegisterClassEvent.java
index 560e35b2..e3bb2d37 100644
--- a/api/src/main/java/javax/jdo/spi/RegisterClassEvent.java
+++ b/api/src/main/java/javax/jdo/spi/RegisterClassEvent.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/spi/RegisterClassListener.java b/api/src/main/java/javax/jdo/spi/RegisterClassListener.java
index dc0b0fdf..70cf9e98 100644
--- a/api/src/main/java/javax/jdo/spi/RegisterClassListener.java
+++ b/api/src/main/java/javax/jdo/spi/RegisterClassListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/spi/StateInterrogation.java b/api/src/main/java/javax/jdo/spi/StateInterrogation.java
index dc492c6a..e89cb5d2 100644
--- a/api/src/main/java/javax/jdo/spi/StateInterrogation.java
+++ b/api/src/main/java/javax/jdo/spi/StateInterrogation.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/main/java/javax/jdo/spi/StateManager.java b/api/src/main/java/javax/jdo/spi/StateManager.java
index 6ce711e3..b6bdb1be 100644
--- a/api/src/main/java/javax/jdo/spi/StateManager.java
+++ b/api/src/main/java/javax/jdo/spi/StateManager.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* https://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java b/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
index 4936f9c2..c7c42afc 100644
--- a/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
+++ b/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/EnhancerTest.java b/api/src/test/java/javax/jdo/EnhancerTest.java
index 353fcf66..0808f541 100644
--- a/api/src/test/java/javax/jdo/EnhancerTest.java
+++ b/api/src/test/java/javax/jdo/EnhancerTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/JDOConfigTestClassLoader.java b/api/src/test/java/javax/jdo/JDOConfigTestClassLoader.java
index 513175b1..f97ce607 100644
--- a/api/src/test/java/javax/jdo/JDOConfigTestClassLoader.java
+++ b/api/src/test/java/javax/jdo/JDOConfigTestClassLoader.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/JDOHelperConfigTest.java b/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
index 7f1594b4..7d096ba2 100644
--- a/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
+++ b/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless 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/test/java/javax/jdo/JDOHelperTest.java b/api/src/test/java/javax/jdo/JDOHelperTest.java
index a6a4f409..7f2a6038 100644
--- a/api/src/test/java/javax/jdo/JDOHelperTest.java
+++ b/api/src/test/java/javax/jdo/JDOHelperTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/MockEnhancer.java b/api/src/test/java/javax/jdo/MockEnhancer.java
index 4ad1d0e5..3100e222 100644
--- a/api/src/test/java/javax/jdo/MockEnhancer.java
+++ b/api/src/test/java/javax/jdo/MockEnhancer.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/ObjectStateTest.java b/api/src/test/java/javax/jdo/ObjectStateTest.java
index 856cf954..058f181f 100644
--- a/api/src/test/java/javax/jdo/ObjectStateTest.java
+++ b/api/src/test/java/javax/jdo/ObjectStateTest.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless 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/test/java/javax/jdo/PMFMapMapTest.java b/api/src/test/java/javax/jdo/PMFMapMapTest.java
index e6fd9674..5196483a 100644
--- a/api/src/test/java/javax/jdo/PMFMapMapTest.java
+++ b/api/src/test/java/javax/jdo/PMFMapMapTest.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless 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/test/java/javax/jdo/PMFProxy.java b/api/src/test/java/javax/jdo/PMFProxy.java
index 007b5898..c9daa021 100644
--- a/api/src/test/java/javax/jdo/PMFProxy.java
+++ b/api/src/test/java/javax/jdo/PMFProxy.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo;
diff --git a/api/src/test/java/javax/jdo/PMFService.java b/api/src/test/java/javax/jdo/PMFService.java
index 238c6c1a..60233d82 100644
--- a/api/src/test/java/javax/jdo/PMFService.java
+++ b/api/src/test/java/javax/jdo/PMFService.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package javax.jdo;
diff --git a/api/src/test/java/javax/jdo/annotations/Line.java b/api/src/test/java/javax/jdo/annotations/Line.java
index c72a8e1a..d59824ed 100644
--- a/api/src/test/java/javax/jdo/annotations/Line.java
+++ b/api/src/test/java/javax/jdo/annotations/Line.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless 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/test/java/javax/jdo/annotations/Point.java b/api/src/test/java/javax/jdo/annotations/Point.java
index 3ee21dd7..09ec68ef 100644
--- a/api/src/test/java/javax/jdo/annotations/Point.java
+++ b/api/src/test/java/javax/jdo/annotations/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/api/src/test/java/javax/jdo/annotations/TestEmbeddedMap.java b/api/src/test/java/javax/jdo/annotations/TestEmbeddedMap.java
index e09032f3..17e35cce 100644
--- a/api/src/test/java/javax/jdo/annotations/TestEmbeddedMap.java
+++ b/api/src/test/java/javax/jdo/annotations/TestEmbeddedMap.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless 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/test/java/javax/jdo/annotations/TestEmbeddedSet.java b/api/src/test/java/javax/jdo/annotations/TestEmbeddedSet.java
index 790909d1..49f3637a 100644
--- a/api/src/test/java/javax/jdo/annotations/TestEmbeddedSet.java
+++ b/api/src/test/java/javax/jdo/annotations/TestEmbeddedSet.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless 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/test/java/javax/jdo/annotations/TestExtensions.java b/api/src/test/java/javax/jdo/annotations/TestExtensions.java
index 410dd5b9..98441293 100644
--- a/api/src/test/java/javax/jdo/annotations/TestExtensions.java
+++ b/api/src/test/java/javax/jdo/annotations/TestExtensions.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless 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/test/java/javax/jdo/identity/ByteIdentityTest.java b/api/src/test/java/javax/jdo/identity/ByteIdentityTest.java
index a4cbd777..ef44fba4 100644
--- a/api/src/test/java/javax/jdo/identity/ByteIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/ByteIdentityTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/identity/CharIdentityTest.java b/api/src/test/java/javax/jdo/identity/CharIdentityTest.java
index f4b543cd..ef68da0a 100644
--- a/api/src/test/java/javax/jdo/identity/CharIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/CharIdentityTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java b/api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java
index 09d099f0..12a24f42 100644
--- a/api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java
+++ b/api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/identity/IntIdentityTest.java b/api/src/test/java/javax/jdo/identity/IntIdentityTest.java
index 9df95167..242f04e8 100644
--- a/api/src/test/java/javax/jdo/identity/IntIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/IntIdentityTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/identity/LongIdentityTest.java b/api/src/test/java/javax/jdo/identity/LongIdentityTest.java
index 53f54f0e..2c378399 100644
--- a/api/src/test/java/javax/jdo/identity/LongIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/LongIdentityTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java b/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
index d15f6c84..f109ba73 100644
--- a/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/identity/ShortIdentityTest.java b/api/src/test/java/javax/jdo/identity/ShortIdentityTest.java
index 2fac39e2..85388d33 100644
--- a/api/src/test/java/javax/jdo/identity/ShortIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/ShortIdentityTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/identity/SingleFieldIdentityTest.java b/api/src/test/java/javax/jdo/identity/SingleFieldIdentityTest.java
index cc2f6e85..99b61c71 100644
--- a/api/src/test/java/javax/jdo/identity/SingleFieldIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/SingleFieldIdentityTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/identity/StringIdentityTest.java b/api/src/test/java/javax/jdo/identity/StringIdentityTest.java
index cac6051b..79882534 100644
--- a/api/src/test/java/javax/jdo/identity/StringIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/StringIdentityTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/listener/InstanceLifecycleEventTest.java b/api/src/test/java/javax/jdo/listener/InstanceLifecycleEventTest.java
index 0c24367a..48832c04 100644
--- a/api/src/test/java/javax/jdo/listener/InstanceLifecycleEventTest.java
+++ b/api/src/test/java/javax/jdo/listener/InstanceLifecycleEventTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/pc/PCPoint.java b/api/src/test/java/javax/jdo/pc/PCPoint.java
index c0e9e1dc..e0f7951a 100644
--- a/api/src/test/java/javax/jdo/pc/PCPoint.java
+++ b/api/src/test/java/javax/jdo/pc/PCPoint.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/schema/XMLTest.java b/api/src/test/java/javax/jdo/schema/XMLTest.java
index 04e0bded..b8f0f798 100644
--- a/api/src/test/java/javax/jdo/schema/XMLTest.java
+++ b/api/src/test/java/javax/jdo/schema/XMLTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java b/api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java
index 299addb4..c997b443 100644
--- a/api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java
+++ b/api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/spi/StateInterrogationTest.java b/api/src/test/java/javax/jdo/spi/StateInterrogationTest.java
index 48f0941b..6f617c47 100644
--- a/api/src/test/java/javax/jdo/spi/StateInterrogationTest.java
+++ b/api/src/test/java/javax/jdo/spi/StateInterrogationTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/stub/StubPMF.java b/api/src/test/java/javax/jdo/stub/StubPMF.java
index 916cc98b..3d4b5cf6 100644
--- a/api/src/test/java/javax/jdo/stub/StubPMF.java
+++ b/api/src/test/java/javax/jdo/stub/StubPMF.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/util/AbstractTest.java b/api/src/test/java/javax/jdo/util/AbstractTest.java
index 0948be97..049a5057 100644
--- a/api/src/test/java/javax/jdo/util/AbstractTest.java
+++ b/api/src/test/java/javax/jdo/util/AbstractTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/util/BatchResultPrinter.java b/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
index 6cd0bf41..82347320 100644
--- a/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
+++ b/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/util/BatchTestRunner.java b/api/src/test/java/javax/jdo/util/BatchTestRunner.java
index a7d2db9b..7cc3cea2 100644
--- a/api/src/test/java/javax/jdo/util/BatchTestRunner.java
+++ b/api/src/test/java/javax/jdo/util/BatchTestRunner.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/java/javax/jdo/util/XMLTestUtil.java b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
index 7ce46006..389a87cf 100644
--- a/api/src/test/java/javax/jdo/util/XMLTestUtil.java
+++ b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/api/src/test/resources/META-INF/services/javax.jdo.JDOEnhancer b/api/src/test/resources/META-INF/services/javax.jdo.JDOEnhancer
index 0009c76e..45a7fc8f 100644
--- a/api/src/test/resources/META-INF/services/javax.jdo.JDOEnhancer
+++ b/api/src/test/resources/META-INF/services/javax.jdo.JDOEnhancer
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/Negative0-dtd.jdo b/api/src/test/resources/Negative0-dtd.jdo
index 1cc0d947..9fa2c7b5 100644
--- a/api/src/test/resources/Negative0-dtd.jdo
+++ b/api/src/test/resources/Negative0-dtd.jdo
@@ -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/test/resources/Negative0-dtd.jdoquery b/api/src/test/resources/Negative0-dtd.jdoquery
index d3cd1f3a..ebaf92e5 100644
--- a/api/src/test/resources/Negative0-dtd.jdoquery
+++ b/api/src/test/resources/Negative0-dtd.jdoquery
@@ -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/test/resources/Negative0-dtd.orm b/api/src/test/resources/Negative0-dtd.orm
index c2303d90..6cc676e3 100644
--- a/api/src/test/resources/Negative0-dtd.orm
+++ b/api/src/test/resources/Negative0-dtd.orm
@@ -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/test/resources/Negative0-xsd.jdo b/api/src/test/resources/Negative0-xsd.jdo
index b360e5d1..0de3e57f 100644
--- a/api/src/test/resources/Negative0-xsd.jdo
+++ b/api/src/test/resources/Negative0-xsd.jdo
@@ -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/test/resources/Negative0-xsd.jdoquery b/api/src/test/resources/Negative0-xsd.jdoquery
index 03fc6446..0d99b8b8 100644
--- a/api/src/test/resources/Negative0-xsd.jdoquery
+++ b/api/src/test/resources/Negative0-xsd.jdoquery
@@ -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/test/resources/Negative0-xsd.orm b/api/src/test/resources/Negative0-xsd.orm
index 63b5cdf9..7f4c5ed1 100644
--- a/api/src/test/resources/Negative0-xsd.orm
+++ b/api/src/test/resources/Negative0-xsd.orm
@@ -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/test/resources/Positive0-dtd.jdo b/api/src/test/resources/Positive0-dtd.jdo
index 94faba68..b42d6004 100644
--- a/api/src/test/resources/Positive0-dtd.jdo
+++ b/api/src/test/resources/Positive0-dtd.jdo
@@ -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/test/resources/Positive0-dtd.jdoquery b/api/src/test/resources/Positive0-dtd.jdoquery
index 1409c1ac..215421df 100644
--- a/api/src/test/resources/Positive0-dtd.jdoquery
+++ b/api/src/test/resources/Positive0-dtd.jdoquery
@@ -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/test/resources/Positive0-dtd.orm b/api/src/test/resources/Positive0-dtd.orm
index 355bdb53..3b301f2c 100644
--- a/api/src/test/resources/Positive0-dtd.orm
+++ b/api/src/test/resources/Positive0-dtd.orm
@@ -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/test/resources/Positive0-xsd.jdo b/api/src/test/resources/Positive0-xsd.jdo
index 2598743e..8bed6920 100644
--- a/api/src/test/resources/Positive0-xsd.jdo
+++ b/api/src/test/resources/Positive0-xsd.jdo
@@ -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/test/resources/Positive0-xsd.jdoquery b/api/src/test/resources/Positive0-xsd.jdoquery
index f012c3fe..865362fb 100644
--- a/api/src/test/resources/Positive0-xsd.jdoquery
+++ b/api/src/test/resources/Positive0-xsd.jdoquery
@@ -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/test/resources/Positive0-xsd.orm b/api/src/test/resources/Positive0-xsd.orm
index 1995c922..f58119d9 100644
--- a/api/src/test/resources/Positive0-xsd.orm
+++ b/api/src/test/resources/Positive0-xsd.orm
@@ -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/test/resources/Positive1-dtd.jdo b/api/src/test/resources/Positive1-dtd.jdo
index a509dc16..ec98b923 100644
--- a/api/src/test/resources/Positive1-dtd.jdo
+++ b/api/src/test/resources/Positive1-dtd.jdo
@@ -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/test/resources/Positive1-dtd.orm b/api/src/test/resources/Positive1-dtd.orm
index e5b6a55d..81846d3f 100644
--- a/api/src/test/resources/Positive1-dtd.orm
+++ b/api/src/test/resources/Positive1-dtd.orm
@@ -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/test/resources/Positive1-xsd.jdo b/api/src/test/resources/Positive1-xsd.jdo
index 08574ec0..87c1bed3 100644
--- a/api/src/test/resources/Positive1-xsd.jdo
+++ b/api/src/test/resources/Positive1-xsd.jdo
@@ -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/test/resources/Positive1-xsd.orm b/api/src/test/resources/Positive1-xsd.orm
index a4789894..baf9dec6 100644
--- a/api/src/test/resources/Positive1-xsd.orm
+++ b/api/src/test/resources/Positive1-xsd.orm
@@ -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/test/resources/Positive15.1-dtd.orm b/api/src/test/resources/Positive15.1-dtd.orm
index 719a7b92..8218ff68 100644
--- a/api/src/test/resources/Positive15.1-dtd.orm
+++ b/api/src/test/resources/Positive15.1-dtd.orm
@@ -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/test/resources/Positive15.1-xsd.orm b/api/src/test/resources/Positive15.1-xsd.orm
index 3161c48c..d5114a49 100644
--- a/api/src/test/resources/Positive15.1-xsd.orm
+++ b/api/src/test/resources/Positive15.1-xsd.orm
@@ -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/test/resources/Positive15.2.1-dtd.orm b/api/src/test/resources/Positive15.2.1-dtd.orm
index a4ad3fac..7ee519f6 100644
--- a/api/src/test/resources/Positive15.2.1-dtd.orm
+++ b/api/src/test/resources/Positive15.2.1-dtd.orm
@@ -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/test/resources/Positive15.2.1-xsd.orm b/api/src/test/resources/Positive15.2.1-xsd.orm
index cbea922c..f2a5be32 100644
--- a/api/src/test/resources/Positive15.2.1-xsd.orm
+++ b/api/src/test/resources/Positive15.2.1-xsd.orm
@@ -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/test/resources/Positive15.2.2-dtd.orm b/api/src/test/resources/Positive15.2.2-dtd.orm
index fe93ac39..a7b7d4d1 100644
--- a/api/src/test/resources/Positive15.2.2-dtd.orm
+++ b/api/src/test/resources/Positive15.2.2-dtd.orm
@@ -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/test/resources/Positive15.2.2-xsd.orm b/api/src/test/resources/Positive15.2.2-xsd.orm
index 899d277e..d41d1c14 100644
--- a/api/src/test/resources/Positive15.2.2-xsd.orm
+++ b/api/src/test/resources/Positive15.2.2-xsd.orm
@@ -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/test/resources/Positive15.3.1-dtd.orm b/api/src/test/resources/Positive15.3.1-dtd.orm
index 0b58ccd3..540c05e0 100644
--- a/api/src/test/resources/Positive15.3.1-dtd.orm
+++ b/api/src/test/resources/Positive15.3.1-dtd.orm
@@ -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/test/resources/Positive15.3.1-xsd.orm b/api/src/test/resources/Positive15.3.1-xsd.orm
index cf5e4aa2..6ee0ada3 100644
--- a/api/src/test/resources/Positive15.3.1-xsd.orm
+++ b/api/src/test/resources/Positive15.3.1-xsd.orm
@@ -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/test/resources/Positive15.3.2-dtd.orm b/api/src/test/resources/Positive15.3.2-dtd.orm
index 31e36511..d117af5f 100644
--- a/api/src/test/resources/Positive15.3.2-dtd.orm
+++ b/api/src/test/resources/Positive15.3.2-dtd.orm
@@ -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/test/resources/Positive15.3.2-xsd.orm b/api/src/test/resources/Positive15.3.2-xsd.orm
index 59051d9e..8452670b 100644
--- a/api/src/test/resources/Positive15.3.2-xsd.orm
+++ b/api/src/test/resources/Positive15.3.2-xsd.orm
@@ -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/test/resources/Positive15.3.3-dtd.orm b/api/src/test/resources/Positive15.3.3-dtd.orm
index b43e7578..840a42fc 100644
--- a/api/src/test/resources/Positive15.3.3-dtd.orm
+++ b/api/src/test/resources/Positive15.3.3-dtd.orm
@@ -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/test/resources/Positive15.3.3-xsd.orm b/api/src/test/resources/Positive15.3.3-xsd.orm
index 3087218a..94b9ebde 100644
--- a/api/src/test/resources/Positive15.3.3-xsd.orm
+++ b/api/src/test/resources/Positive15.3.3-xsd.orm
@@ -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/test/resources/Positive15.3.4-dtd.orm b/api/src/test/resources/Positive15.3.4-dtd.orm
index debc980f..7d4f6563 100644
--- a/api/src/test/resources/Positive15.3.4-dtd.orm
+++ b/api/src/test/resources/Positive15.3.4-dtd.orm
@@ -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/test/resources/Positive15.3.4-xsd.orm b/api/src/test/resources/Positive15.3.4-xsd.orm
index 1cdec0ce..72534d72 100644
--- a/api/src/test/resources/Positive15.3.4-xsd.orm
+++ b/api/src/test/resources/Positive15.3.4-xsd.orm
@@ -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/test/resources/Positive15.3.5-dtd.orm b/api/src/test/resources/Positive15.3.5-dtd.orm
index 020d2038..6b346939 100644
--- a/api/src/test/resources/Positive15.3.5-dtd.orm
+++ b/api/src/test/resources/Positive15.3.5-dtd.orm
@@ -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/test/resources/Positive15.3.5-xsd.orm b/api/src/test/resources/Positive15.3.5-xsd.orm
index c1eba420..1059153c 100644
--- a/api/src/test/resources/Positive15.3.5-xsd.orm
+++ b/api/src/test/resources/Positive15.3.5-xsd.orm
@@ -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/test/resources/Positive15.3.6-dtd.orm b/api/src/test/resources/Positive15.3.6-dtd.orm
index bb2191de..7cded158 100644
--- a/api/src/test/resources/Positive15.3.6-dtd.orm
+++ b/api/src/test/resources/Positive15.3.6-dtd.orm
@@ -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/test/resources/Positive15.3.6-xsd.orm b/api/src/test/resources/Positive15.3.6-xsd.orm
index 63e36351..4dce0616 100644
--- a/api/src/test/resources/Positive15.3.6-xsd.orm
+++ b/api/src/test/resources/Positive15.3.6-xsd.orm
@@ -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/test/resources/Positive15.4-dtd.orm b/api/src/test/resources/Positive15.4-dtd.orm
index 813c251a..beb64f97 100644
--- a/api/src/test/resources/Positive15.4-dtd.orm
+++ b/api/src/test/resources/Positive15.4-dtd.orm
@@ -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/test/resources/Positive15.4-xsd.orm b/api/src/test/resources/Positive15.4-xsd.orm
index 29dc1342..87f72cf6 100644
--- a/api/src/test/resources/Positive15.4-xsd.orm
+++ b/api/src/test/resources/Positive15.4-xsd.orm
@@ -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/test/resources/Positive15.5-dtd.orm b/api/src/test/resources/Positive15.5-dtd.orm
index 692beb65..60c74ef1 100644
--- a/api/src/test/resources/Positive15.5-dtd.orm
+++ b/api/src/test/resources/Positive15.5-dtd.orm
@@ -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/test/resources/Positive15.5-xsd.orm b/api/src/test/resources/Positive15.5-xsd.orm
index 660ebd1b..d5dda1d5 100644
--- a/api/src/test/resources/Positive15.5-xsd.orm
+++ b/api/src/test/resources/Positive15.5-xsd.orm
@@ -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/test/resources/Positive15.6-dtd.orm b/api/src/test/resources/Positive15.6-dtd.orm
index 3d2092ce..83ce31e5 100644
--- a/api/src/test/resources/Positive15.6-dtd.orm
+++ b/api/src/test/resources/Positive15.6-dtd.orm
@@ -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/test/resources/Positive15.6-xsd.orm b/api/src/test/resources/Positive15.6-xsd.orm
index d16d9fb1..126fa1c2 100644
--- a/api/src/test/resources/Positive15.6-xsd.orm
+++ b/api/src/test/resources/Positive15.6-xsd.orm
@@ -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/test/resources/Positive15.8.1-dtd.orm b/api/src/test/resources/Positive15.8.1-dtd.orm
index fab1fe9d..70bdb687 100644
--- a/api/src/test/resources/Positive15.8.1-dtd.orm
+++ b/api/src/test/resources/Positive15.8.1-dtd.orm
@@ -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/test/resources/Positive15.8.1-xsd.orm b/api/src/test/resources/Positive15.8.1-xsd.orm
index 0801a684..433c0c85 100644
--- a/api/src/test/resources/Positive15.8.1-xsd.orm
+++ b/api/src/test/resources/Positive15.8.1-xsd.orm
@@ -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/test/resources/Positive15.8.2-dtd.orm b/api/src/test/resources/Positive15.8.2-dtd.orm
index 1a5946cb..1b26cc39 100644
--- a/api/src/test/resources/Positive15.8.2-dtd.orm
+++ b/api/src/test/resources/Positive15.8.2-dtd.orm
@@ -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/test/resources/Positive15.8.2-xsd.orm b/api/src/test/resources/Positive15.8.2-xsd.orm
index 476fa355..866d6ba5 100644
--- a/api/src/test/resources/Positive15.8.2-xsd.orm
+++ b/api/src/test/resources/Positive15.8.2-xsd.orm
@@ -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/test/resources/Positive15.8.3-dtd.orm b/api/src/test/resources/Positive15.8.3-dtd.orm
index 06b5e2f5..a92182e7 100644
--- a/api/src/test/resources/Positive15.8.3-dtd.orm
+++ b/api/src/test/resources/Positive15.8.3-dtd.orm
@@ -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/test/resources/Positive15.8.3-xsd.orm b/api/src/test/resources/Positive15.8.3-xsd.orm
index 17aad11b..92f4436f 100644
--- a/api/src/test/resources/Positive15.8.3-xsd.orm
+++ b/api/src/test/resources/Positive15.8.3-xsd.orm
@@ -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/test/resources/Positive99-dtd.jdo b/api/src/test/resources/Positive99-dtd.jdo
index ea371c62..0bee9674 100644
--- a/api/src/test/resources/Positive99-dtd.jdo
+++ b/api/src/test/resources/Positive99-dtd.jdo
@@ -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/test/resources/Positive99-dtd.jdoquery b/api/src/test/resources/Positive99-dtd.jdoquery
index f59176e6..d1e2f92f 100644
--- a/api/src/test/resources/Positive99-dtd.jdoquery
+++ b/api/src/test/resources/Positive99-dtd.jdoquery
@@ -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/test/resources/Positive99-dtd.orm b/api/src/test/resources/Positive99-dtd.orm
index b1b26002..b7ddadf6 100644
--- a/api/src/test/resources/Positive99-dtd.orm
+++ b/api/src/test/resources/Positive99-dtd.orm
@@ -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/test/resources/Positive99-xsd.jdo b/api/src/test/resources/Positive99-xsd.jdo
index 77750dd3..3e3e8ba7 100644
--- a/api/src/test/resources/Positive99-xsd.jdo
+++ b/api/src/test/resources/Positive99-xsd.jdo
@@ -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/test/resources/Positive99-xsd.jdoquery b/api/src/test/resources/Positive99-xsd.jdoquery
index e92be0f1..9a5a1f26 100644
--- a/api/src/test/resources/Positive99-xsd.jdoquery
+++ b/api/src/test/resources/Positive99-xsd.jdoquery
@@ -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/test/resources/Positive99-xsd.orm b/api/src/test/resources/Positive99-xsd.orm
index d094e845..6ab64584 100644
--- a/api/src/test/resources/Positive99-xsd.orm
+++ b/api/src/test/resources/Positive99-xsd.orm
@@ -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/test/resources/enhancer-test-dir/enhancer-test-subdir/file4.jdo b/api/src/test/resources/enhancer-test-dir/enhancer-test-subdir/file4.jdo
index b4655cfe..0e4a8071 100644
--- a/api/src/test/resources/enhancer-test-dir/enhancer-test-subdir/file4.jdo
+++ b/api/src/test/resources/enhancer-test-dir/enhancer-test-subdir/file4.jdo
@@ -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/test/resources/enhancer-test-dir/file1.jdo b/api/src/test/resources/enhancer-test-dir/file1.jdo
index b4655cfe..0e4a8071 100644
--- a/api/src/test/resources/enhancer-test-dir/file1.jdo
+++ b/api/src/test/resources/enhancer-test-dir/file1.jdo
@@ -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/test/resources/jdoconfig/Negative00/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative00/META-INF/jdoconfig.xml
index 72d7933a..2da64340 100644
--- a/api/src/test/resources/jdoconfig/Negative00/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative00/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml
index 36e6c87a..a977feea 100644
--- a/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml
index 76cf474d..e154b9e4 100644
--- a/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml
index 4a7b8749..c847044e 100644
--- a/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml
index ad1d7a2e..78ad662f 100644
--- a/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml
index 1e09c707..73dd3346 100644
--- a/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.xml
index b378b849..f0ff0ab6 100644
--- a/api/src/test/resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.xml
index b378b849..f0ff0ab6 100644
--- a/api/src/test/resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative07/META-INF/services/javax.jdo.PersistenceManagerFactory b/api/src/test/resources/jdoconfig/Negative07/META-INF/services/javax.jdo.PersistenceManagerFactory
index 61371f6f..b76e4ac4 100644
--- a/api/src/test/resources/jdoconfig/Negative07/META-INF/services/javax.jdo.PersistenceManagerFactory
+++ b/api/src/test/resources/jdoconfig/Negative07/META-INF/services/javax.jdo.PersistenceManagerFactory
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/jdoconfig/Negative08/META-INF/services/javax.jdo.PersistenceManagerFactory b/api/src/test/resources/jdoconfig/Negative08/META-INF/services/javax.jdo.PersistenceManagerFactory
index c9b32692..bf327a20 100644
--- a/api/src/test/resources/jdoconfig/Negative08/META-INF/services/javax.jdo.PersistenceManagerFactory
+++ b/api/src/test/resources/jdoconfig/Negative08/META-INF/services/javax.jdo.PersistenceManagerFactory
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.xml
index ec3d4154..7922f2a9 100644
--- a/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.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/test/resources/jdoconfig/Negative09/9a/META-INF/services/javax.jdo.PersistenceManagerFactory b/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/services/javax.jdo.PersistenceManagerFactory
index 53a06da3..0f43694a 100644
--- a/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/services/javax.jdo.PersistenceManagerFactory
+++ b/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/services/javax.jdo.PersistenceManagerFactory
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/jdoconfig/Negative09/9b/META-INF/services/javax.jdo.PersistenceManagerFactory b/api/src/test/resources/jdoconfig/Negative09/9b/META-INF/services/javax.jdo.PersistenceManagerFactory
index 8b181c0c..2943eccb 100644
--- a/api/src/test/resources/jdoconfig/Negative09/9b/META-INF/services/javax.jdo.PersistenceManagerFactory
+++ b/api/src/test/resources/jdoconfig/Negative09/9b/META-INF/services/javax.jdo.PersistenceManagerFactory
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml
index 91c99983..53b00e53 100644
--- a/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.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/test/resources/jdoconfig/Pmfmapmap02/propsfile.props b/api/src/test/resources/jdoconfig/Pmfmapmap02/propsfile.props
index dea8fee0..9fb86a30 100644
--- a/api/src/test/resources/jdoconfig/Pmfmapmap02/propsfile.props
+++ b/api/src/test/resources/jdoconfig/Pmfmapmap02/propsfile.props
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml
index 424b53c9..a9786884 100644
--- a/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.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/test/resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.xml
index 17ea27c6..534fd2fd 100644
--- a/api/src/test/resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.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/test/resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.xml
index f70900af..19e86cd6 100644
--- a/api/src/test/resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.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/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml
index 97bb1130..1c6889a5 100644
--- a/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.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/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml
index 5fc3bee3..fc9e5929 100644
--- a/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.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/test/resources/jdoconfig/Positive03/META-INF/services/javax.jdo.PersistenceManagerFactory b/api/src/test/resources/jdoconfig/Positive03/META-INF/services/javax.jdo.PersistenceManagerFactory
index cd34277e..6ea9b8ec 100644
--- a/api/src/test/resources/jdoconfig/Positive03/META-INF/services/javax.jdo.PersistenceManagerFactory
+++ b/api/src/test/resources/jdoconfig/Positive03/META-INF/services/javax.jdo.PersistenceManagerFactory
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml
index 5fc3bee3..fc9e5929 100644
--- a/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.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/test/resources/jdoconfig/Positive04/META-INF/services/javax.jdo.PersistenceManagerFactory b/api/src/test/resources/jdoconfig/Positive04/META-INF/services/javax.jdo.PersistenceManagerFactory
index 5f87a688..56e435aa 100644
--- a/api/src/test/resources/jdoconfig/Positive04/META-INF/services/javax.jdo.PersistenceManagerFactory
+++ b/api/src/test/resources/jdoconfig/Positive04/META-INF/services/javax.jdo.PersistenceManagerFactory
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml
index 5fc3bee3..fc9e5929 100644
--- a/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.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/test/resources/jdoconfig/Positive05/META-INF/services/javax.jdo.PersistenceManagerFactory b/api/src/test/resources/jdoconfig/Positive05/META-INF/services/javax.jdo.PersistenceManagerFactory
index 03df67b5..c270dce4 100644
--- a/api/src/test/resources/jdoconfig/Positive05/META-INF/services/javax.jdo.PersistenceManagerFactory
+++ b/api/src/test/resources/jdoconfig/Positive05/META-INF/services/javax.jdo.PersistenceManagerFactory
@@ -6,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless 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/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml
index 91fc579c..267b53d6 100644
--- a/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.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/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml
index 9a792310..7b489827 100644
--- a/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.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/exectck/pom.xml b/exectck/pom.xml
index 4ad229b1..40ec3b89 100644
--- a/exectck/pom.xml
+++ b/exectck/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/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java b/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
index 39db770c..45435b70 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
@@ -5,7 +5,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/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java b/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
index 11ee87c9..f9543812 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/exectck/src/main/java/org/apache/jdo/exectck/Help.java b/exectck/src/main/java/org/apache/jdo/exectck/Help.java
index aabe1933..8f6ba78e 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/Help.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/Help.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java b/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
index 3fa9ab5b..901cca95 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
@@ -5,7 +5,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/exectck/src/main/java/org/apache/jdo/exectck/PropertyUtils.java b/exectck/src/main/java/org/apache/jdo/exectck/PropertyUtils.java
index 676828dc..9575898f 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/PropertyUtils.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/PropertyUtils.java
@@ -5,7 +5,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/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java b/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
index cfda5f7f..8ec32ba5 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
@@ -5,7 +5,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/exectck/src/main/java/org/apache/jdo/exectck/SQLFileLoader.java b/exectck/src/main/java/org/apache/jdo/exectck/SQLFileLoader.java
index bb4d4bb4..4739c86b 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/SQLFileLoader.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/SQLFileLoader.java
@@ -5,7 +5,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/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java b/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java
index 0d334d3f..409bb4e0 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/jdo_checks.xml b/jdo_checks.xml
index 736fe692..27ba7229 100644
--- a/jdo_checks.xml
+++ b/jdo_checks.xml
@@ -8,7 +8,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless 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 6f25ea31..be1c4264 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -38,8 +38,12 @@
<url>http://db.apache.org/jdo</url>
<inceptionYear>2005</inceptionYear>
<organization>
+<<<<<<< Updated upstream
<!-- The name is used when generating a NOTICE file -->
<name>The Apache Software Foundation</name>
+=======
+ <name>Apache Software Foundation</name>
+>>>>>>> Stashed changes
<url>https://www.apache.org</url>
</organization>
diff --git a/tck/NOTICE.txt b/tck/NOTICE.txt
index 1243a0a2..03c30542 100644
--- a/tck/NOTICE.txt
+++ b/tck/NOTICE.txt
@@ -2,4 +2,4 @@ Apache Java Data Objects (JDO)
Copyright 2005-2006 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/tck/RunRules.md b/tck/RunRules.md
index a1018bf4..46ae879a 100644
--- a/tck/RunRules.md
+++ b/tck/RunRules.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/tck/pom.xml b/tck/pom.xml
index 4d7b6ec1..8c858906 100644
--- a/tck/pom.xml
+++ b/tck/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/AbstractReaderTest.java b/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
index 410d56cf..a42192b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
index da41b979..316259ee 100644
--- a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
+++ b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java b/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
index 9f625dc2..a70fe4d7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/converter/IntAttributeConverterTest.java b/tck/src/main/java/org/apache/jdo/tck/api/converter/IntAttributeConverterTest.java
index 20097300..0754860b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/converter/IntAttributeConverterTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/converter/IntAttributeConverterTest.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/converter/PointAttributeConverterTest.java b/tck/src/main/java/org/apache/jdo/tck/api/converter/PointAttributeConverterTest.java
index 6f05acdb..5bf881ca 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/converter/PointAttributeConverterTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/converter/PointAttributeConverterTest.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/exceptions/ExceptionConstructor.java b/tck/src/main/java/org/apache/jdo/tck/api/exceptions/ExceptionConstructor.java
index 3c02aca4..e9df7241 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/exceptions/ExceptionConstructor.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/exceptions/ExceptionConstructor.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.exceptions;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java b/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
index ab7c2559..2a4a5efe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
index a9fed2b8..898c0b6d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java
index d5f5d0c2..9d6ef3aa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
index a0e9d629..4c8904fa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
index af51f372..9c52a547 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java
index 8bea35ca..a1802dfa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java
index 20556b74..675d2f88 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
index 1630e7d7..b60377fd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
index 69b3474a..753a1bea 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
index 6c587649..fe4d0866 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
index 7806e9e3..f38cda29 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
index 796be656..9842989c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
index 99896ac8..2d6526ba 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
index 86b5f330..724210f4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
index fc6bbd77..d46c6d1f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
index 560572c6..36421aa6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
index 4235bfaf..ee335d99 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
index 3cace3ed..8188d612 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java
index 275a7b30..345131f9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java
index 672969b6..90ebcdd1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.jdohelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
index d1e04b5a..6cd4c635 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
index bd6116b9..f82a51e7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.jdohelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java
index 44d6dac6..80beb42e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
index bb640085..ea0bcfb7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java
index 762e2674..8fb82673 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java
index eb382be8..ae111af3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java
index 8ead928f..a171a202 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java
index 3d5f2ca0..4b9381b7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java
index 0a50f9c4..726de3e5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java
index 7c785cf6..de4e54ed 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java
index caf1c258..17b4290a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java
index 3e0d4e10..a66df98b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java
index 0e21277a..afcc2285 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java
index bb366fb0..23d23ae7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java
index 90593c94..62dd9876 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java
index dadad8c3..3407446a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java
index 4723778e..497c83a1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java
index 7b07013b..b7708145 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.jdohelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java
index e5a8286a..a6a047f1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java
index 8556213b..c44c8ac7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java
index c3e8e549..13eddff2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java
index 9aeaf2af..2e7e8856 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java
index bb765b68..7187c5c8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java
index 275e58d8..dd0830a8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java
index 15157312..dafd954a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java
index 1f442991..06bdda32 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java
index 32c2b005..eded619f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java
index ce370e5e..2a49f72b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java
index f00a06c0..93f39d15 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java
index d18419b7..efdd7958 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java
index 7cd0ded6..feb495c6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java
index 4d578157..e8e37b25 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentNotPersistenceCapable.java
index 1599f8c5..a83b0fc5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java
index 534c22f6..2930b801 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java
index 046ecf5b..be8b0aac 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java
index b982e34e..83fc6fe5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForTransient.java
index 4ec57e96..228b4a4e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalNotPersistenceCapable.java
index 5cd7e743..0e71f0fb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java
index 8f537c1a..969172ba 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java
index 26a988d2..b6d6d8ed 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java
index d564a194..d42ff2a8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java
index 025e5fdb..557825f1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
index 11dca877..f8b2e790 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java
index d42ca851..84687b39 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
index 220284f4..35c2b5b6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ChangingObjectIdHasNoEffectOnInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ChangingObjectIdHasNoEffectOnInstance.java
index e20a21ae..81dd56d1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ChangingObjectIdHasNoEffectOnInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ChangingObjectIdHasNoEffectOnInstance.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagers.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagers.java
index 4301356e..de506f41 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagers.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagers.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagersSameClasses.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagersSameClasses.java
index c919d04b..0838581a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagersSameClasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagersSameClasses.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/CurrentTransaction.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/CurrentTransaction.java
index 141ecb4b..1a849177 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/CurrentTransaction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/CurrentTransaction.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreCacheTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreCacheTest.java
index 5c31779b..e5917e92 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreCacheTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreCacheTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
index 085d8a4f..331ba756 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnectionThrows.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnectionThrows.java
index 1d18eed7..0e439346 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnectionThrows.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnectionThrows.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
index 70ccb55f..b82e7ceb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistent.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistent.java
index 9da71447..3561606c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistent.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentAllFails.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentAllFails.java
index ec6d1c8b..1294b04f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentAllFails.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentAllFails.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceIsTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceIsTransient.java
index bfad0b3b..241a829f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceIsTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceIsTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
index 74e39ae9..5bf0595a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentHasNoEffectOnDeletedInstances.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentHasNoEffectOnDeletedInstances.java
index 5fee2a81..fe9ff5b1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentHasNoEffectOnDeletedInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentHasNoEffectOnDeletedInstances.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPersistenceManagerFactory.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPersistenceManagerFactory.java
index f4b6b4b0..78953d08 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPersistenceManagerFactory.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPersistenceManagerFactory.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
index 82004d16..1c4f5137 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java
index 6f3c6152..ef2b746b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetSetUserObject.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetSetUserObject.java
index 3e6aca8c..7bf2f32d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetSetUserObject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetSetUserObject.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWhenObjectIdBeingChanged.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWhenObjectIdBeingChanged.java
index 706ee38e..dc4da60b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWhenObjectIdBeingChanged.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWhenObjectIdBeingChanged.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWithNoTransaction.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWithNoTransaction.java
index 3f668be0..efd3adca 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWithNoTransaction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWithNoTransaction.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
index 9c7d6450..04f01f65 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NoPersistenceManagerIfTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NoPersistenceManagerIfTransient.java
index 3b537293..7a54e1a7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NoPersistenceManagerIfTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NoPersistenceManagerIfTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ObjectIdUniqueAmongInstances.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ObjectIdUniqueAmongInstances.java
index 820ce84d..e62248a4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ObjectIdUniqueAmongInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ObjectIdUniqueAmongInstances.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
index 94199dda..d0ad6fe7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OnePersistenceManagerIfPersistentOrTransactional.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OnePersistenceManagerIfPersistentOrTransactional.java
index 2c671414..665e460f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OnePersistenceManagerIfPersistentOrTransactional.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OnePersistenceManagerIfPersistentOrTransactional.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
index 610006a3..89bcf943 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
index 45734475..4f28e4f2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/SameTransactionInstanceForAllCallsToCurrentTransaction.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/SameTransactionInstanceForAllCallsToCurrentTransaction.java
index 5254321f..d88e0feb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/SameTransactionInstanceForAllCallsToCurrentTransaction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/SameTransactionInstanceForAllCallsToCurrentTransaction.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java
index 065a37be..95c5ffd0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/TransientTransactionalInstanceRetainsValuesAtCommit.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/TransientTransactionalInstanceRetainsValuesAtCommit.java
index dd044019..794e04ff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/TransientTransactionalInstanceRetainsValuesAtCommit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/TransientTransactionalInstanceRetainsValuesAtCommit.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingEvictAllWithCollectionContainingNulls.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingEvictAllWithCollectionContainingNulls.java
index 3bb2415a..4f5e32f8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingEvictAllWithCollectionContainingNulls.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingEvictAllWithCollectionContainingNulls.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingRefreshAllWithCollectionContainingNulls.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingRefreshAllWithCollectionContainingNulls.java
index 62e9efee..cea99e7d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingRefreshAllWithCollectionContainingNulls.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingRefreshAllWithCollectionContainingNulls.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
index 07338dd0..4f51b2c8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
index 4d6639c6..b0a3c9c7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
index 393641bf..d890a112 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
index 9387f3c0..89addd01 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictAllThrowsException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictAllThrowsException.java
index 5ae9d476..b52623da 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictAllThrowsException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictAllThrowsException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictHasNoEffect.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictHasNoEffect.java
index b0ace288..68720b6f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictHasNoEffect.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictHasNoEffect.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshAllThrowsException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshAllThrowsException.java
index b9d74f3e..8bdb91a5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshAllThrowsException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshAllThrowsException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshHasNoEffect.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshHasNoEffect.java
index 2f8db077..3ce495a1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshHasNoEffect.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshHasNoEffect.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
index d0cd890b..e06b3b6f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
index d35b9b8f..b9d69ee1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithNoParameters.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithNoParameters.java
index 364d3784..be77687e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithNoParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithNoParameters.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
index 8abc7c1b..b7073ae2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
index a56fde6c..66b27ed2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AfterCloseAllMethodsThrowException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AfterCloseAllMethodsThrowException.java
index 19444198..cabe18e7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AfterCloseAllMethodsThrowException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AfterCloseAllMethodsThrowException.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AutoCloseable.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AutoCloseable.java
index 4a1d2c69..a6e40e0f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AutoCloseable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AutoCloseable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/CloseWithActiveTxRollsBack.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/CloseWithActiveTxRollsBack.java
index 2b3ae18b..719eedeb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/CloseWithActiveTxRollsBack.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/CloseWithActiveTxRollsBack.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponConstruction.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponConstruction.java
index 42d89f15..d89f1b8a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponConstruction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponConstruction.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponRetrievalFromPool.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponRetrievalFromPool.java
index 9d1f6192..0825004a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponRetrievalFromPool.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponRetrievalFromPool.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsTrueAfterClose.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsTrueAfterClose.java
index f3d4fee7..22874202 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsTrueAfterClose.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsTrueAfterClose.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
index cc1df8b4..18f460eb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
index 4ce57f0b..e6eb5367 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAllOnCommit.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAllOnCommit.java
index a74354b6..740d63fe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAllOnCommit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAllOnCommit.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
index 65efe186..149120ad 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
index b62a0c73..2c1fc088 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachCopy.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachCopy.java
index 7615535a..0e35f282 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachCopy.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachCopy.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
index 33cc721c..429237b6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java
index 5fcccc88..c2d06200 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachUndetachable.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachUndetachable.java
index 01b1e21a..a1f9faed 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachUndetachable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachUndetachable.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/SetDetachAllOnCommit.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/SetDetachAllOnCommit.java
index f805c547..1cfc72cf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/SetDetachAllOnCommit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/SetDetachAllOnCommit.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithInstancesMadePersistentViaReachability.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithInstancesMadePersistentViaReachability.java
index 86e9cb59..208752dd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithInstancesMadePersistentViaReachability.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithInstancesMadePersistentViaReachability.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithNoSubclasses.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithNoSubclasses.java
index f709a224..2285e1bf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithNoSubclasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithNoSubclasses.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java
index 089ccacb..ab39fe7b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
index 03187af4..ddd8b28f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
index 6bbd0d04..2259f937 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java
index 80b273cf..cfceaceb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanMakeTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanMakeTransient.java
index 0c0588a6..e0b0a283 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanMakeTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanMakeTransient.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanQuery.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanQuery.java
index 8ba6119f..d6c72510 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanQuery.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java
index db5bdb4a..62a6aa0a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRetrieve.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRetrieve.java
index 9dacbb48..e5200668 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRetrieve.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRetrieve.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java
index ff877850..fad91aeb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToFalse.java
index 408f0a01..1a960d45 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToFalse.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
+=======
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+>>>>>>> Stashed changes
* limitations under the License.
*/
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java
index 2098b8c7..cb822001 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java
@@ -5,6 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
+<<<<<<< Updated upstream
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -12,6 +13,15 @@
... 24802 lines suppressed ...