Commit Graph

357 Commits

Author SHA1 Message Date
Christian Beikov 1cb6ff8916 Cleanup naming of JavaTypeDescriptor and JdbcTypeDescriptor implementations. Get rid of PrimitiveType, IdentifierType, DiscriminatorType and AllowableTemporalParameterType 2021-10-07 08:15:53 +02:00
Christian Beikov 9e83129fc3 Change JavaTypeDescriptor#fromString to accept a CharSequence instead of String and introduce CharSequence utilities to avoid creating intermediate strings 2021-10-05 15:18:38 +02:00
Steve Ebersole 998caa56af HHH-14848 - Move Ant tasks + support from hibernate-core into tooling/hibernate-ant 2021-09-29 01:31:47 -05:00
Steve Ebersole 7bc1d55cdd improved aggregated javadoc generation 2021-09-27 08:21:36 -05:00
Steve Ebersole 47b58f7fa2 HHH-14837 - Move to Jakarta EE
- fix ConcreteLike.java from hibernate-jpamodelgen
2021-09-27 08:21:36 -05:00
Steve Ebersole 995e7d9780 HHH-14837 - Move to Jakarta EE
- fix hibernate-jpamodelgen dependencies
2021-09-27 08:21:36 -05:00
Steve Ebersole 089a3f86ae HHH-14837 - Move to Jakarta EE
preliminary transformation;
only `javax.persistence.*` settings supported atm
2021-09-27 08:21:27 -05:00
Christian Beikov 99f4363a98 Switch to junit 5 platform for hibernate-enhance-maven-plugin module 2021-09-02 16:54:46 +02:00
Christian Beikov 0b0d9339a6 Switch to old junit platform for hibernate-enhance-maven-plugin module 2021-09-02 16:54:46 +02:00
Christian Beikov 65016aaf42 Implement envers order fragment support by introducing an internal sqm function and re-enable all envers tests 2021-09-02 16:54:46 +02:00
Andrea Boriero cdeb95a4d5 Merge remote-tracking branch 'upstream/main' into wip/6.0 2021-08-30 14:07:19 +02:00
Sanne Grinovero 9267c5e6a6 HHH-14792 Remove support for bytecode enhancement via Javassist 2021-08-26 15:22:30 +01:00
boris-unckel c9b8776d3a HHH-14760 Close resource - potential resource leak
Fixes https://hibernate.atlassian.net/browse/HHH-14760
2021-08-09 10:40:27 +01:00
boris-unckel 3be25aa899 HHH-14760 Close resource - potential resource leak
Fixes https://hibernate.atlassian.net/browse/HHH-14760
2021-08-09 10:28:06 +01:00
Steve Ebersole f43016cd34 "fix" for Gradle plugin publishing 2021-08-05 08:26:39 -05:00
Andrea Boriero 4c5b1cb2a8 plugin publishing tokens 2021-08-04 19:08:17 +02:00
Steve Ebersole ac8a212393 plugin publishing tokens 2021-08-04 11:17:25 -05:00
Steve Ebersole 8ab124d5f3 plugin publishing tokens 2021-08-04 07:41:56 -05:00
Steve Ebersole 9dd7afb136 plugin publishing tokens 2021-08-04 07:26:29 -05:00
Steve Ebersole 3b78f30309 Few Gradle file related tasks
- dropped explicit apt output handling - Gradle has that built in
- Switched other uses to write to the standard `${buildDir}/generated/sources` dir
2021-08-02 16:35:16 -05:00
Andrea Boriero e93f43a43f Merge remote-tracking branch 'upstream/main' into wip/6.0 2021-08-02 14:02:30 +02:00
Christian Beikov e528a1ab53 HHH-14768 Fix recursive type variable rendering 2021-08-02 09:59:41 +02:00
Steve Ebersole a716b348f7 japmodelgen xjc task cacheability 2021-07-29 13:31:21 -05:00
Christian Beikov 1a6924c297 HHH-14724 Fix generation of problematic metamodel classes which use TYPE_USE annotations 2021-07-29 12:59:43 +02:00
Thomas Heigl 0fdf431715 HHH-14724 Add test for intersection types 2021-07-29 12:59:43 +02:00
Thomas Heigl e868e61cec HHH-14724 Test-case demonstrating compilation issues with converters and validation 2021-07-29 12:59:43 +02:00
Steve Ebersole 9f2ae95397 Gradle task cache
Gradle 7 prep
2021-07-26 13:51:38 -05:00
Steve Ebersole 174b23001f Fix Jakarta processing 2021-07-01 21:17:30 -05:00
Steve Ebersole 172ddf8700 Improved build configuration to better leverage Gradle up-to-date handling;
Preparation for moving to Gradle 7.0

- Improve Jakarta transformation handling (tests are also actually run now as a bonus);
- Improved CacheableHbmXmlTest to not write "ser" file to `${buildDir}/resources/test`
- Improved DatabaseService(Plugin)
- Update a number of plugins which did not handle up-to-date-ness properly
2021-06-26 08:46:09 -05:00
Hibernate-CI fe3b6690c1 fixes to in-line jakarta transformation tasks
- fix path replacements (test bundles)
- drop inaccurate attempts to access javadoc/sources jar tasks and outputs for jakarta projects - they are not producing them (alternatively, and eventually will have to, we could have them produce those artifacts)
- skip jakarta modules for aggregated javadoc building
2021-06-16 09:55:38 -05:00
Markus Heiden 26038d1b00 HHH-14657 Use the compile instead of runtime classpath
The runtime classpath contains the dependencies as jars that are not yet built when the plugin needs them. So use the compile classpath plus the compiled classes of the current project.
2021-06-14 16:30:32 +01:00
Markus Heiden 423b13b50a HHH-14657 Use the compile instead of runtime classpath
The runtime classpath contains the dependencies as jars that are not yet built when the plugin needs them. So use the compile classpath plus the compiled classes of the current project.
2021-06-14 16:30:32 +01:00
Andrea Boriero 451568f322 Merge remote-tracking branch 'upstream/main' into wip/6.0_merge_7 2021-05-31 14:55:18 +02:00
Andrea Boriero 2c6e000537 Merge branch 'wip/6.0_merge_6' into wip/6.0 2021-05-31 13:18:38 +02:00
Yoann Rodière 07eca3883d HHH-14635 Upgrade to log4j 2 2021-05-26 09:05:56 +02:00
Steve Ebersole b2bdcf9778 HHH-14634 : Gradle Enterprise
- Allow for passing `hibernatePublishUsername`, `hibernatePublishPassword`, ``hibernatePluginPortalUsername` and hibernatePluginPortalPassword` as system-properties (-D) as well as property-properties (-P).  Jenkins needs to specify them as system-properties
2021-05-24 15:44:21 -05:00
Andrea Boriero ffae5474a6 Merge remote-tracking branch 'upstream/main' into wip/6.0_merge_6 2021-05-24 20:41:03 +02:00
Steve Ebersole 80801d27bb Improved Gradle Plugin Portal auth handling 2021-05-24 11:49:58 -05:00
Steve Ebersole b51fb9fe03 Fixed problems with
- javadoc generation
- SourceForge distribution bundles
2021-05-19 16:15:57 -05:00
Steve Ebersole 5ae9e9fb7e prepare for 6.0.0.Alpha8 2021-05-18 14:58:16 -05:00
Steve Ebersole 8518c04862 prepare for 6.0.0.Alpha8 2021-05-18 14:55:00 -05:00
Steve Ebersole db502bf1b0 prepare for 6.0.0.Alpha8 2021-05-18 12:37:36 -05:00
Steve Ebersole c349551fc3 fixed CI job task 2021-05-14 16:47:30 -05:00
Steve Ebersole c7e37dc1d7 HHH-14513 : Move publishing release and snapshot artifacts to Sonatype OSSRH 2021-05-14 15:06:15 -05:00
Christian Beikov ff9e9eebc9 HHH-13946 Create Jakarta artifacts for hibernate-core, hibernate-envers, hibernate-jpamodelgen and hibernate-testing 2021-04-30 11:41:05 +02:00
Andrea Boriero b27b414511 Fix EmbeddedForeignKeyDescriptor creation when o.h.mapping.Value has no columns, Re-enabled additional tests 2021-04-22 13:52:16 +02:00
Andrea Boriero c48606a5aa Merge remote-tracking branch 'upstream/main' into wip/6.0_merge_1 2021-04-20 09:45:47 +02:00
Yoann Rodière b0abe9f37e HHH-14563 Remove the DOM4J dependency from hibernate-enhance-maven-plugin
As far as I can tell, this was only necessary as a transitive dependency
of Hibernate ORM.
2021-04-19 15:39:35 +02:00
Steve Ebersole 7fcde66d61 HHH-14524 : Rename SqlType(X) as JdbcType(X) 2021-03-29 11:33:56 -05:00
Gavin King bbf4619fcd remove deprecated Sort annotation 2021-03-25 18:54:41 +01:00
Andrea Boriero c3df793dbe HHH-14509 : Git master -> main branch renaming 2021-03-22 12:38:00 +01:00
Andrea Boriero 96d103215c Merge remote-tracking branch 'upstream/main' into wip/6.0 2021-03-22 12:26:31 +01:00
Steve Ebersole 725faa258f HHH-14509 : Git master -> main branch renaming 2021-03-19 10:59:03 -05:00
Andrea Boriero 6250942e7f Merge remote-tracking branch 'upstream/master' into wip/6.0 2021-03-05 11:18:14 +01:00
Vlad Mihalcea 17c5fab50e HHH-12338 - Incorrect metamodel for basic collections 2021-03-04 13:22:37 +01:00
Christian Beikov 6643e9f4bc Use java.lang.reflect.Type instead of java.lang.Class for JavaTypeDescriptor#getJavaType to support parameterized types 2021-02-23 12:22:54 +01:00
Andrea Boriero 6d124a7c6d Merge remote-tracking branch 'upstream/master' into wip/6.0 2021-01-14 11:34:06 +01:00
Jan Schatteman 9965551056 Remove left-over references to @ServiceRegistry.Setting (follow-up on commit 'Fix compilation errors' - 9770b49)
Signed-off-by: Jan Schatteman <jschatte@redhat.com>
2020-12-19 18:58:18 +01:00
Yoann Rodière 1acb6fea52 HHH-14371 Add --add-opens options required for Gradle plugin tests
Signed-off-by: Yoann Rodière <yoann@hibernate.org>
2020-12-14 14:02:18 +00:00
Christian Beikov d9446e7c77 Fix a few test issues, implement tuple emulation, group by support and support configuring criteria value handling mode 2020-12-08 11:27:27 +01:00
Andrea Boriero 1927d1aa33 Merge branch 'master' into wip/6.0 2020-11-17 12:40:43 +01:00
Steve Ebersole d4233ce6a8 fixed issue with project-template module wrt version 2020-11-11 08:26:34 -06:00
Yoann Rodière 9616e24c80 HHH-14315 Add optional support for toolchains to the Gradle build
Signed-off-by: Yoann Rodière <yoann@hibernate.org>
2020-11-10 11:02:08 +00:00
Steve Ebersole 29848c49db ORM + Gradle
HHH-14285 - project template
HHH-14286 - Gradle plugin
2020-10-28 16:09:42 -05:00
Andrea Boriero 9cf4edfbee Merge remote-tracking branch 'upstream/master' into wip/6.0 2020-10-26 08:14:01 +00:00
Sanne Grinovero 55cb66780d HHH-10715 Make static constant collections immutable in metamodel-generator 2020-10-25 21:33:11 +00:00
Sanne Grinovero 1de234ea93 HHH-10715 Unclear excepion handling 2020-10-25 21:33:06 +00:00
Sanne Grinovero b8ddc70ff1 HHH-10715 Dodgy comparison with Boolean instance 2020-10-25 21:33:04 +00:00
Andrea Boriero 8b938610cf Merge remote-tracking branch 'upstream/master' into wip/6.0_merge 2020-09-08 08:19:13 +01:00
Sanne Grinovero ea24abd757 HHH-9422 Metamodel Generator should close streams opened to persistence.xml and referenced mapping files 2020-09-02 12:22:25 +01:00
Andrea Boriero 4550c70d15 Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_47 2020-07-20 10:50:17 +01:00
Yoann Rodière 12127b2272 HHH-14111 Ensure Groovy compilation tasks target the same JDK version as the rest of the project 2020-07-20 10:25:15 +02:00
Andrea Boriero 5c86c4a805 Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_29 2020-04-09 07:37:11 +01:00
Andrea Boriero b897a36f2f Fix issue with generated pom missing project description 2020-04-06 18:21:11 +01:00
Yoann Rodière 9bb76a5cca HHH-13925 Upgrade hibernate-gradle-plugin to Gradle 6 2020-04-06 16:04:55 +02:00
Yoann Rodière aebf9d192f HHH-13925 Fix invalid javadoc syntax
This wasn't detected by checkstyle in Gradle 5, but it is now, and that
fails the build.
2020-04-06 16:04:55 +02:00
Steve Ebersole 40d0c8580e Merge remote-tracking branch 'upstream/master' into wip/6.0
- up to the point of upgrading Gradle version for wrapper to 5.6.3
2020-04-01 11:32:00 -05:00
Yoann Rodière 6921b02891 HHH-13685 Upgrade to Gradle 5.6.3 2020-04-01 09:53:13 -05:00
Andrea Boriero abe1e656f7 Merge remote-tracking branch 'upstream/master' into wip/6.0 2020-03-03 16:59:30 +00:00
Nathan Xu d8d8d6e112 Fix some obvious log or exception message issues 2020-02-28 08:12:45 +00:00
Christoph Dreis 1364929fe0 HHH-13870 - Add explaining comment 2020-02-19 12:20:42 -06:00
Christoph Dreis 5ea5bd12b0 HHH-13870 - Extract task action in Gradle plugin to fix up-to-date checks
Lambdas are not allowed and cause the compile task to be always out of date
2020-02-19 12:20:42 -06:00
Sam De Block a60a10f009 HHH-13390
Upgrade JPA MetaModel Generator (jpamodelgen) to support Gradle Incremental Compile
2020-01-29 20:23:11 +01:00
Chris Cranford 0e329bef5a HHH-12030 - Fix ClassCastException when Embeddable collection uses generic types 2019-11-14 13:56:56 +00:00
Steve Ebersole 57fba402b4 HHH-12858 - Persistence.createEntityManagerFactory(Map) should allow overwriting jta-data-source of persistence.xml 2019-09-25 15:12:25 -05:00
Steve Ebersole 4ff3c0b6e4 HHH-13130 - Provide Gradle-based bytecode enhancement as a task separate from the compileJava task 2019-09-25 12:28:28 -05:00
Steve Ebersole 5c9cf4d0d8 HHH-13130 - Provide Gradle-based bytecode enhancement as a task separate from the compileJava task 2019-09-18 12:05:39 -05:00
Sanne Grinovero 71fe4229b4 HHH-13133 Review logging usage in the MavenEnhancePlugin 2019-08-05 11:44:24 +01:00
skis ac7d7f4d6f HHH-13133 Changed the log level from info to debug to reduce the amount of logging under non-debug mode 2019-08-05 11:17:11 +01:00
Sebastian Nohn 7e71843a50 HHH-13463 - updated plexus-utils to 3.0.24 to avoid being vulnerable to CVE-2017-1000487 2019-06-27 20:06:02 +01:00
Sebastian Nohn c10832a740 HHH-13463 - updated plexus-utils to 3.0.24 to avoid being vulnerable to CVE-2017-1000487 2019-06-27 20:06:02 +01:00
Sergey Morgunov b9edc8d323 HHH-13145 - Generated metamodel class can't be compiled. 2018-12-17 13:54:55 +01:00
Guillaume Smet 190dedc8fc HHH-13128 Add missing jaxb-runtime dependency to metamodel generator
It's necessary for JDK 11 and we missed it when we added the
jaxb-runtime dependency to hibernate-core.
2018-11-29 11:20:44 +01:00
Guillaume Smet 5cdf56774d HHH-13097 Add a missing @Override 2018-11-13 23:52:55 +00:00
Henning Rohlfs aa441ddb12 HHH-13071 Use SourceSetOutput.getClassesDirs to prevent deprecation warnings during build when using the gradle plugin 2018-11-02 17:01:13 +01:00
Yoann Rodière 653b123276 HHH-12990 Remove unnecessary dependencies to JSR-250 when generating JAXB classes
It seems these dependencies were not necessary at all, even before the
previous patches.
2018-10-17 11:50:45 +02:00
Yoann Rodière e436b316da HHH-12990 Auto-detect the fqcn of the Generated annotation in jpamodelgen
It's "javax.annotation.Generated" in Java 8 and below, but
"javax.annotation.processing.Generated" in Java 9 and above.
2018-10-17 11:50:45 +02:00
Yoann Rodière 5fd97472b9 HHH-12946 Enable JAXB dependencies regardless of the JDK being used when building Hibernate ORM
Previously we would only add the dependency when building with JDK9+,
and we built all releases using JDK8.
This means the dependencies were useless, because they would never be
mentioned in the actual POMs published to users.
2018-10-17 11:43:03 +02:00
Yoann Rodière 2daa3811c6 HHH-12946 Remove unnecessary dependencies when building with JDK9+
We don't need to depend on JAXB's compiler (XJC) in our modules,
we just need the dependency in specific tasks during the build.
In particular we don't want users to transitively depend on XJC.

Also, we don't need an explicit dependency to JAXB in every module,
having one in hibernate-core is enough.
2018-10-17 11:43:03 +02:00
Yoann Rodière 51ab9f744d HHH-12946 Add explicit dependencies to JAXB APIs where relevant 2018-10-17 11:43:03 +02:00