[openjpa] branch master updated (f883073 -> 60d506a)

Markus Koschany apo at moszumanska.debian.org
Fri Jun 23 13:36:46 UTC 2017


This is an automated email from the git hooks/post-receive script.

apo pushed a change to branch master
in repository openjpa.

      from  f883073   Switch to compat level 10.
       new  2879d11   Use --download-current-version option for uscan.
      adds  b1888b1   New upstream version 2.4.2
       new  b236134   Merge tag 'upstream/2.4.2'
       new  e66f0c2   Declare compliance with Debian Policy 4.0.0.
       new  1f5ffb5   Use https for Format field.
       new  192760b   Remove preserve file. It does nothing.
       new  d0bca3e   Update changelog
       new  b650f86   Drop fix_poms.diff
       new  ded5e6b   Drop java8-compatibility.patch. No longer needed.
       new  934d035   Drop fix-compilation-error.patch.
       new  c43739f   Use the parent pom.
       new  7cab78a   Build-depend on junit4.
       new  1eebb0f   Build-depend on ant-contrib.
       new  4dadd84   Add openjpa-xmlstore-no-tests.patch
       new  4d32b14   Update patch headers.
       new  60d506a   Update changelog

The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 NOTICE                                             |   2 +-
 debian/changelog                                   |  18 +
 debian/control                                     |   4 +-
 debian/copyright                                   |   2 +-
 debian/libopenjpa-java.poms                        |  20 +-
 debian/maven.rules                                 |   2 +-
 debian/patches/exclude-was-uow.diff                |  16 +-
 debian/patches/fix-compilation-error.patch         |  46 --
 debian/patches/fix_poms.diff                       | 242 ---------
 debian/patches/java8-compatibility.patch           |  23 -
 debian/patches/openjpa-xmlstore-no-tests.patch     |  52 ++
 debian/patches/series                              |   4 +-
 debian/preserve                                    |   2 -
 debian/rules                                       |   2 +-
 openjpa-all/pom.xml                                |   2 +-
 openjpa-examples/image-gallery/pom.xml             |   2 +-
 openjpa-examples/openbooks/pom.xml                 |   2 +-
 openjpa-examples/pom.xml                           |   2 +-
 openjpa-examples/simple/pom.xml                    |   2 +-
 openjpa-integration/daytrader/pom.xml              |   3 +-
 openjpa-integration/examples/pom.xml               |   5 +-
 openjpa-integration/jmx/pom.xml                    |   2 +-
 openjpa-integration/pom.xml                        |   2 +-
 openjpa-integration/slf4j/pom.xml                  |   3 +-
 openjpa-integration/tck/pom.xml                    |   3 +-
 openjpa-integration/validation/pom.xml             |   6 +-
 .../integration/validation/TestEagerInit.java      |   1 -
 openjpa-jdbc/pom.xml                               |   4 +-
 .../openjpa/jdbc/conf/JDBCConfigurationImpl.java   |   3 +-
 .../openjpa/jdbc/kernel/JDBCBrokerFactory.java     |   2 +-
 .../kernel/MappedQueryResultObjectProvider.java    |  14 +
 .../jdbc/kernel/PreparedQueryCacheImpl.java        |  21 +-
 .../apache/openjpa/jdbc/kernel/TableJDBCSeq.java   |   7 +-
 .../openjpa/jdbc/kernel/exps/EqualExpression.java  |  31 +-
 .../org/apache/openjpa/jdbc/kernel/exps/Lit.java   |   9 +-
 .../org/apache/openjpa/jdbc/meta/ClassMapping.java |  26 +
 .../apache/openjpa/jdbc/meta/FieldMappingInfo.java |   1 -
 .../org/apache/openjpa/jdbc/meta/MappingInfo.java  |   2 +-
 .../openjpa/jdbc/meta/MappingRepository.java       |  22 +-
 .../org/apache/openjpa/jdbc/meta/MappingTool.java  |  22 +-
 .../RelationToManyInverseKeyFieldStrategy.java     |  10 +-
 .../org/apache/openjpa/jdbc/schema/Column.java     |  15 +-
 .../openjpa/jdbc/schema/DBCPDriverDataSource.java  |   3 +-
 .../openjpa/jdbc/schema/DataSourceFactory.java     |  22 +-
 .../openjpa/jdbc/schema/SchemaGenerator.java       |   5 +-
 .../org/apache/openjpa/jdbc/schema/SchemaTool.java | 123 +++--
 .../org/apache/openjpa/jdbc/schema/Schemas.java    |   3 +-
 .../org/apache/openjpa/jdbc/sql/DB2Dictionary.java |   5 +-
 .../org/apache/openjpa/jdbc/sql/DBDictionary.java  |  24 +-
 .../openjpa/jdbc/sql/DBDictionaryFactory.java      |   4 +-
 .../apache/openjpa/jdbc/sql/EmpressDictionary.java |   3 +-
 .../apache/openjpa/jdbc/sql/HSQLDictionary.java    |   7 +-
 .../openjpa/jdbc/sql/InformixDictionary.java       |  31 +-
 .../apache/openjpa/jdbc/sql/OracleDictionary.java  | 107 ++--
 .../openjpa/jdbc/sql/PointbaseDictionary.java      |   3 +-
 .../openjpa/jdbc/sql/PostgresDictionary.java       |  13 +-
 .../openjpa/jdbc/sql/SQLServerDictionary.java      |   7 +-
 .../apache/openjpa/jdbc/sql/SybaseDictionary.java  |   5 +-
 .../apache/openjpa/jdbc/sql/TestDB2Dictionary.java |  46 +-
 .../jdbc/sql/TestDBDictionaryGeneratedSQL.java     |  71 +--
 .../openjpa/jdbc/sql/TestMySQLDictionary.java      |  27 +-
 openjpa-jest/pom.xml                               |   2 +-
 openjpa-kernel/pom.xml                             |   4 +-
 .../apache/openjpa/conf/OpenJPAConfiguration.java  |  34 ++
 .../openjpa/conf/OpenJPAConfigurationImpl.java     |  23 +
 .../org/apache/openjpa/conf/Specification.java     |   4 +-
 .../openjpa/datacache/QueryCacheStoreQuery.java    |   7 +
 .../org/apache/openjpa/enhance/AsmAdaptor.java     |  79 +++
 .../openjpa/enhance/InstrumentationFactory.java    |  19 +-
 .../openjpa/enhance/PCClassFileTransformer.java    |   6 +
 .../java/org/apache/openjpa/kernel/QueryImpl.java  |  23 +-
 .../openjpa/kernel/jpql/JPQLExpressionBuilder.java |  20 +-
 .../openjpa/meta/AbstractCFMetaDataFactory.java    |  59 ++-
 .../openjpa/util/BlacklistClassResolver.java       |  62 +++
 .../org/apache/openjpa/util/Serialization.java     |   3 +-
 .../org/apache/openjpa/event/localizer.properties  |   2 +-
 .../instrumentation/jmx/localizer.properties       |   2 +-
 .../org/apache/openjpa/enhance/TestAsmAdaptor.java | 249 ++++++++++
 openjpa-lib/pom.xml                                |   4 +-
 .../apache/openjpa/lib/conf/ConfigurationImpl.java |  14 +-
 .../apache/openjpa/lib/conf/Configurations.java    |   4 +-
 .../openjpa/lib/identifier/IdentifierUtilImpl.java |   3 +-
 .../openjpa/lib/jdbc/DelegatingConnection.java     |  21 +-
 .../org/apache/openjpa/lib/util/JavaVendors.java   |   3 +-
 .../util/concurrent/NullSafeConcurrentHashMap.java | 418 ----------------
 .../util/concurrent/SizedConcurrentHashMap.java    | 129 -----
 openjpa-persistence-jdbc/pom.xml                   |   6 +-
 .../jdbc/AnnotationPersistenceMappingParser.java   |   2 +-
 .../org/apache/openjpa/jdbc/meta/EntityBool.java   |   8 +-
 .../meta/{EntityBool.java => EntityBoolChar.java}  |  15 +-
 .../openjpa/jdbc/meta/TestMappingToolRefresh.java  | 109 +++++
 .../persistence/DummyPersistenceCapeable.java      |  30 --
 .../org/apache/openjpa/persistence/TestUnwrap.java |  76 +++
 .../TestXMLPersistenceMetaDataParser.java          |  12 +-
 .../common/apps/annotApp/annotype/AnnoTest2.java   |   3 +-
 .../common/apps/annotApp/annotype/Entity1.java     |   2 +-
 .../common/apps/annotApp/ddtype/Entity1.java       |   2 +-
 .../pudefault/TestNoPUDefaultCascadePersist.java   |   3 +-
 .../pudefault/TestPUDefaultCascadePersist.java     |   3 +-
 .../openjpa/persistence/common/apps/Entity1.java   |   2 +-
 .../datacache/DistributedCacheTest.java            |   2 +-
 .../apache/openjpa/persistence/detach/Entity1.java |   2 +
 .../openjpa/persistence/embed/TestEmbeddable.java  |   3 +-
 .../persistence/embed/compositepk/Subject.java     |  71 +++
 .../embed/compositepk/SubjectIdClass.java          |  59 +++
 .../persistence/embed/compositepk/SubjectKey.java  |  91 ++++
 .../embed/compositepk/SubjectKey_.java}            |  37 +-
 .../embed/compositepk/SubjectWithIdClass.java      |  95 ++++
 .../embed/compositepk/SubjectWithIdClass_.java     |  26 +-
 .../embed/compositepk/Subject_.java}               |  36 +-
 .../compositepk/TestCompositePrimaryKeys.java      | 538 +++++++++++++++++++++
 .../persistence/embed/compositepk/Topic.java       |  92 ++++
 .../embed/compositepk/Topic_.java}                 |  37 +-
 .../enhance/DynamicEnhancementSuite.java           |   5 +-
 .../persistence/enhance/common/apps/Entity1.java   |   2 +-
 .../entity/MixedMappingLocationEmbeddedId.java     |   3 -
 .../exception/TestParameterLogging.java            |   1 -
 .../TestTableGeneratorUseSchemaNameProp.java       |  60 +++
 .../jdbc/common/apps/mappingApp/Entity1.java       |   4 +-
 .../persistence/jdbc/meta/TestBuildSchema.java     |   8 +-
 .../jdbc/schema/TestSchemaGenerator.java           |  12 +-
 .../persistence/kernel/common/apps/Entity1.java    |   2 +-
 .../apache/openjpa/persistence/merge/LineItem.java | 142 ++++++
 .../openjpa/persistence/merge/LineItemPK.java      |  85 ++++
 .../apache/openjpa/persistence/merge/Order.java    |  91 ++++
 .../persistence/merge/TestMultipleMerge.java       |  87 ++++
 .../TestQueryConvertPositionalParameters.java      |   1 -
 .../persistence/query/TestQueryTimeout.java        |   3 +-
 .../TupleQueryTest.java}                           |  57 ++-
 .../persistence/query/common/apps/Entity1.java     |   2 +-
 .../sqlresultmapping/CrtOperacaoEntity.java}       |  52 +-
 .../CrtRequisicaoChequePersEntity.java             |  64 +++
 .../sqlresultmapping/CrtRequisicaoEntity.java}     |  35 +-
 .../sqlresultmapping/TestSQLResultSetMapping.java  | 128 +++++
 .../QCEntityM2O.java}                              | 108 +++--
 .../querycache/TestQueryCacheWithDataCache.java    |  88 ++++
 .../querycache/common/apps/Entity1.java            |   2 +
 ...ntity.java => ImplicitValueStrategyEntity.java} |  28 +-
 .../value/PrincipalValueStrategyHandler.java       |  87 ++++
 .../strategy/value/TestImplicitValueStrategy.java  |  65 +++
 .../strategy/value/TestValueStrategy.java          |  43 +-
 .../strategy/value/ValueStrategyEntity.java        |  15 +
 .../org/apache/openjpa/persistence/orm.xml         |   4 +
 openjpa-persistence-locking/pom.xml                |   2 +-
 openjpa-persistence/pom.xml                        |   2 +-
 .../AnnotationPersistenceXMLMetaDataParser.java    |   9 +-
 .../openjpa/persistence/EntityManagerImpl.java     |  15 +-
 .../apache/openjpa/persistence/JPAProperties.java  |  11 +-
 .../openjpa/persistence/MixedLockLevelsHelper.java |   3 +-
 .../persistence/PersistenceMetaDataDefaults.java   |   5 +-
 .../persistence/PersistenceProductDerivation.java  |   7 +-
 .../persistence/XMLPersistenceMetaDataParser.java  |   2 +-
 .../persistence/criteria/CriteriaQueryImpl.java    |   4 +
 .../openjpa/persistence/util/ReservedWords.java    |   3 +-
 .../openjpa/persistence/util/SourceCode.java       |   2 +-
 .../openjpa/persistence/localizer.properties       |   4 +-
 openjpa-project/BUILDING.txt                       |  30 +-
 openjpa-project/CHANGES.txt                        | 183 +------
 openjpa-project/README.txt                         |   2 +
 openjpa-project/RELEASE-NOTES.html                 | 168 ++-----
 openjpa-project/RELEASE_STEPS.adoc                 | 147 ++++++
 openjpa-project/checkstyle.xml                     |   2 +-
 openjpa-project/pom.xml                            |  45 +-
 openjpa-project/source-assembly.xml                |   4 +-
 openjpa-project/src/doc/manual/manual.xml          |   2 +-
 openjpa-project/src/doc/manual/ref_guide_conf.xml  |  47 ++
 .../src/doc/manual/ref_guide_dbsetup.xml           |  54 +++
 openjpa-slice/pom.xml                              |   8 +-
 .../org/apache/openjpa/slice/TestTransaction.java  |   3 +
 openjpa-tools/openjpa-fetch-statistics-was/pom.xml |   2 +-
 openjpa-tools/openjpa-fetch-statistics/pom.xml     |   4 +-
 openjpa-tools/openjpa-maven-plugin/pom.xml         |  34 +-
 .../src/it/default_settings/pom.xml                |   5 -
 .../tools/maven/test/ItDefaultSettingsTest.java    |   1 -
 .../src/it/dependingArtifact/pom.xml               |   6 -
 .../src/it/dependingArtifact/prjA/pom.xml          |   8 +-
 .../src/it/dependingArtifact/prjB/pom.xml          |   5 -
 .../it/enhanceIncludesExcludes/invoker.properties  |  18 +
 .../pom.xml                                        |  42 +-
 .../main/java/enhance/exclude/TestEntityA.java}    |  51 +-
 .../main/java/enhance/include/TestEntityB.java}    |  51 +-
 .../src/main/java/foo/TestEntityC.java}            |  51 +-
 .../src/main/resources/META-INF/persistence.xml    |  35 ++
 .../src/test/java/VerifyTest.java                  |  48 +-
 .../src/it/enhanceIncludesExcludes/verify.groovy   |  29 +-
 .../src/it/nonDefaultPersistenceXml/pom.xml        |   6 -
 .../pom.xml                                        |  57 ++-
 .../maven/testentity/DropSchemaTestEntity.java     |  79 +++
 .../src/main/resources/META-INF/persistence.xml    |   0
 .../openjpa/tools/maven/test/ItDropSchemaTest.java |  50 ++
 .../src/it/testDependencies/pom.xml                |   5 -
 .../src/it/testDependencies/prjA/pom.xml           |   8 -
 .../src/it/testDependencies/prjB/pom.xml           |   6 -
 .../tools/maven/AbstractOpenJpaEnhancerMojo.java   |  10 +-
 .../maven/AbstractOpenJpaMappingToolMojo.java      |   6 +-
 .../openjpa/tools/maven/AbstractOpenJpaMojo.java   |  71 ++-
 .../openjpa/tools/maven/OpenJpaEnhancerMojo.java   |  12 +-
 .../openjpa/tools/maven/OpenJpaSchemaMojo.java     |  16 +-
 .../apache/openjpa/tools/maven/OpenJpaSqlMojo.java |  19 +-
 .../tools/maven/OpenJpaTestEnhancerMojo.java       |  27 +-
 .../{TestEntity.java => SampleEntity.java}         |   7 +-
 .../src/test/resources/META-INF/persistence.xml    |   2 +-
 openjpa-tools/pom.xml                              |   2 +-
 openjpa-xmlstore/pom.xml                           |   2 +-
 openjpa/pom.xml                                    |  27 +-
 pom.xml                                            | 100 ++--
 206 files changed, 4448 insertions(+), 2226 deletions(-)
 delete mode 100644 debian/patches/fix-compilation-error.patch
 delete mode 100644 debian/patches/fix_poms.diff
 delete mode 100644 debian/patches/java8-compatibility.patch
 create mode 100644 debian/patches/openjpa-xmlstore-no-tests.patch
 delete mode 100644 debian/preserve
 create mode 100644 openjpa-kernel/src/main/java/org/apache/openjpa/util/BlacklistClassResolver.java
 create mode 100644 openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java
 delete mode 100644 openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NullSafeConcurrentHashMap.java
 delete mode 100644 openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/SizedConcurrentHashMap.java
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/{EntityBool.java => EntityBoolChar.java} (87%)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolRefresh.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectIdClass.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey.java
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/{jdbc/meta/EntityBool.java => persistence/embed/compositepk/SubjectKey_.java} (57%)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass.java
 copy openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojo.java => openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass_.java (56%)
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/{jdbc/meta/EntityBool.java => persistence/embed/compositepk/Subject_.java} (62%)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic.java
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/{jdbc/meta/EntityBool.java => persistence/embed/compositepk/Topic_.java} (59%)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItem.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItemPK.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/{strategy/value/TestValueStrategy.java => query/TupleQueryTest.java} (50%)
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/{detach/Entity1.java => query/sqlresultmapping/CrtOperacaoEntity.java} (58%)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/{strategy/value/ValueStrategyEntity.java => query/sqlresultmapping/CrtRequisicaoEntity.java} (61%)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/{strategy/value/ValueStrategyEntity.java => querycache/QCEntityM2O.java} (56%)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/{ValueStrategyEntity.java => ImplicitValueStrategyEntity.java} (59%)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/PrincipalValueStrategyHandler.java
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java
 create mode 100644 openjpa-project/RELEASE_STEPS.adoc
 create mode 100644 openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/invoker.properties
 copy openjpa-tools/openjpa-maven-plugin/src/it/{default_settings => enhanceIncludesExcludes}/pom.xml (78%)
 copy openjpa-tools/openjpa-maven-plugin/src/{test/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java => it/enhanceIncludesExcludes/src/main/java/enhance/exclude/TestEntityA.java} (60%)
 copy openjpa-tools/openjpa-maven-plugin/src/{test/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java => it/enhanceIncludesExcludes/src/main/java/enhance/include/TestEntityB.java} (60%)
 copy openjpa-tools/openjpa-maven-plugin/src/{test/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java => it/enhanceIncludesExcludes/src/main/java/foo/TestEntityC.java} (61%)
 create mode 100644 openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/resources/META-INF/persistence.xml
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java => openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/test/java/VerifyTest.java (50%)
 copy openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java => openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/verify.groovy (61%)
 copy openjpa-tools/openjpa-maven-plugin/src/it/{default_settings => sqlActionDropSchema}/pom.xml (66%)
 create mode 100644 openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/main/java/org/apache/openjpa/tools/maven/testentity/DropSchemaTestEntity.java
 copy openjpa-tools/openjpa-maven-plugin/src/it/{default_settings => sqlActionDropSchema}/src/main/resources/META-INF/persistence.xml (100%)
 create mode 100644 openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/test/java/org/apache/openjpa/tools/maven/test/ItDropSchemaTest.java
 rename openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/{TestEntity.java => SampleEntity.java} (92%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjpa.git



More information about the pkg-java-commits mailing list