Andrea Boriero
7fd6e4fbea
Fix issue with fetch a ManyToOne with join table using inner join
2020-06-26 10:15:47 +01:00
Andrea Boriero
cdc0e3f817
Re-enabled additional tests
2020-06-26 10:15:47 +01:00
Andrea Boriero
79e5203897
Re-enabled additional tests
2020-06-26 10:15:47 +01:00
Andrea Boriero
567b6cc076
Re-enabled additional tests
2020-06-26 10:15:46 +01:00
Andrea Boriero
2d0aad36b8
Fix PluralAttribute manyToMany FK target part determination
2020-06-26 10:15:46 +01:00
Andrea Boriero
47eee7cfe4
Re-enabled additional tests
2020-06-26 10:15:46 +01:00
Andrea Boriero
ead64b3ec9
Add AssociationKey for bidirectionality detection
2020-06-26 10:15:46 +01:00
Andrea Boriero
511d4d55cd
Add more tests
2020-06-26 10:15:46 +01:00
Andrea Boriero
2bf36075a4
Re-enabled additional tests and fixed issues with joined subclass inheritance with discriminator
2020-06-26 10:03:24 +01:00
Andrea Boriero
d0f891fca5
Fix determine join type for subclasses
2020-06-26 06:18:12 +01:00
Andrea Boriero
9d749a6608
Re-enabled additional tests
2020-06-26 06:18:01 +01:00
Andrea Boriero
b9c3dd1cf6
Fix issue with column Size determination
2020-06-24 15:40:38 +01:00
Andrea Boriero
8bd63116d0
HHH-14077 PostgreSQL, skip testLiteralProjectionAndGroupBy (PostgreSQL does not support literals in group by statement)
2020-06-23 10:48:52 -05:00
Andrea Boriero
eebf01fbf3
HHH-14077 CVE-2019-14900 SQL injection issue using JPA Criteria API
2020-06-23 10:48:52 -05:00
Andrea Boriero
d9a33bf405
HHH-14077 Add test for issue
2020-06-23 10:48:52 -05:00
Nathan Xu
2250b7f84f
implement 'NULLS (FIRST | LAST)' in HQL
2020-06-23 10:32:43 -05:00
Steve Ebersole
fc2051af71
remove potential duplicated class loading in JpaMetamodelImpl
2020-06-23 10:22:38 -05:00
Nathan Xu
fdc2112b19
implement @RowId
2020-06-23 10:17:50 -05:00
Nathan Xu
4c856725f8
fix some logging performance issues
2020-06-23 10:12:24 -05:00
Nathan Xu
233b8daffb
import entity graph parsing test cases
2020-06-23 10:11:16 -05:00
Nathan Xu
06605956f9
enable legacy filter testing cases
2020-06-23 09:59:39 -05:00
Falko Modler
c44150d0d6
HHH-14023 H2Dialect: adjust NUMERIC, DECIMAL & VARBINARY for 1.4.201+
2020-06-22 11:22:27 +01:00
Falko Modler
b44b20ba11
HHH-14023 H2Dialect: SequenceInformationExtractorLegacyImpl for 1.4.201+
2020-06-22 11:22:27 +01:00
Gail Badner
467203e8c4
HHH-14075 : Changes to loaders and TwoPhaseLoad to allow "internal" loading to be reused by hibernate-reactive
2020-06-22 10:03:34 +01:00
Andrea Boriero
9756b0fba8
HHH-14077 PostgreSQL, skip testLiteralProjectionAndGroupBy (PostgreSQL does not support literals in group by statement)
2020-06-19 17:52:20 +01:00
Andrea Boriero
bb9233472b
HHH-14081 CompositeIdFkGeneratedValueIdentityTest and CompositeIdFkGeneratedValueTest failures on Oracle db
2020-06-19 14:41:15 +01:00
Gail Badner
3f3c1ab506
HHH-14077 : CVE-2019-14900 SQL injection issue using JPA Criteria API
2020-06-18 12:13:22 -07:00
Gail Badner
c1771040c7
HHH-14077 : Added test case
2020-06-18 11:49:09 -07:00
Andrea Boriero
cfc1de9de6
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_44
2020-06-16 08:23:55 +01:00
Martin Vietz
180656e9f3
HHH-14064 - Fix documentation for schema-generation
2020-06-09 14:38:55 +01:00
Réda Housni Alaoui
5963dc7fe8
HHH-13980 NullPointerException on AbstractEntityGraphVisitationStrategy.startingCollectionIndex
2020-05-31 07:50:49 -05:00
Steve Ebersole
bf575ef065
Prefer `FetchOptions` over `FetchStrategy`
2020-05-29 15:14:31 -05:00
Steve Ebersole
d3f6f46980
renamed `SingularAssociationAttributeMapping` to `ToOneAttributeMapping`
2020-05-29 14:35:21 -05:00
Andrea Boriero
b06c341d8a
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_43
2020-05-29 15:01:19 +01:00
Steve Ebersole
26f6c9271a
Added Initializer de-duplication handling
2020-05-29 06:33:17 -05:00
Gail Badner
6df82bb6a6
HHH-14044 : Extract code from Loader into protected methods
2020-05-29 10:27:37 +01:00
Hannes Rosenögger
b9703e33d4
HHH-14022 Revert HHH-13322 Fix Oracle dialect's introduced in 5.4.13 that is causing issues with sequence increment determination
2020-05-29 10:12:34 +01:00
Jason Pyeron
0804de87b4
HHH-10956 reduced runtime complexity, added Component.getProperty(int)
...
Component.getProperty(String) was looping and comparing, but we already now the position of the property
2020-05-29 08:32:18 +01:00
Andrea Boriero
2db3ce2643
HHH-10956 an exception has to thrown when the composite key is an association and its value is null
2020-05-29 08:32:18 +01:00
Andrea Boriero
114e16f64f
HHH-10956 Add additional test
2020-05-29 08:32:18 +01:00
Andrea Boriero
cfcd2ac40f
HHH-10956 Moved tests using GenerationType#IDENTITY into another class annotated with @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
2020-05-29 08:32:18 +01:00
Jason Pyeron
42b38b60cf
HHH-10956 put one line if in {}
2020-05-29 08:32:18 +01:00
Jason Pyeron
e37a8da568
HHH-10956 added more complext tests with self referential FK
...
* known issue: HHH-13971, test marked as @Ignore
* added some output debugging to help developers review CI/CD logs
* 8 tests, 1 ignored, 0.745s duration
2020-05-29 08:32:18 +01:00
Jason Pyeron
e42fe94f65
HHH-10956 fixed failed insertion with IdClass with partial identifier generation
...
* regression introduced by HHH-4848
* AbstractEntityTuplizer lines 179 and 311 formatting issues, preserved
* bug HHH-9662 blocks testing of Identity insertion
2020-05-29 08:32:18 +01:00
Jason Pyeron
da2b24b598
HHH-10956 created test cases IdClass with partial identifier generatiod, all marked @FailureExpected
2020-05-29 08:32:18 +01:00
Andrea Boriero
58fe82e730
Revert "HHH-14022 Oracle-Dialect does not find Sequences outside User-Schema"
...
This reverts commit ca0ae9bfad
.
2020-05-29 07:42:39 +01:00
varun.shrivastava
ca0ae9bfad
HHH-14022 Oracle-Dialect does not find Sequences outside User-Schema
2020-05-29 07:01:22 +01:00
Sanne Grinovero
c013ae12b7
HHH-14047 Expose some methods of EntityManagerFactoryBuilderImpl to extensions
2020-05-28 20:49:25 +01:00
Sanne Grinovero
76e305ba75
HHH-14047 Allow customization of the StandardServiceRegistryBuilder by extending the EntityManagerFactoryBuilderImpl
2020-05-28 20:49:25 +01:00
Sanne Grinovero
d7373a86bb
HHH-14046 Allow customizing the type of SessionFactory by changing the initial ServiceInitiator list
2020-05-28 20:49:25 +01:00
Andrea Boriero
2baa5fccdc
HHH-13959 Add nullability and uniqueness for @OneToOne with @JoinTable
2020-05-28 18:39:16 +01:00
Andrea Boriero
038b3ce487
HHH-13959 Add test for issue
2020-05-28 18:39:16 +01:00
gavinking
1d2d67677f
HHH-14049 AbstractEntityPersister make three private methods protected for use in Hibernate Reactive
2020-05-28 18:27:42 +01:00
gavinking
b5edf6cabe
HHH-14048 Expose lazy property fetching to Hibernate reactive
2020-05-28 18:20:42 +01:00
Steve Ebersole
4074c39264
system loggers
2020-05-27 10:34:19 -05:00
Steve Ebersole
4d725e916c
minor
2020-05-27 10:34:19 -05:00
gavinking
17152bfbba
expose a private field to Hibernate Reactive
...
needed to support Criteria queries
2020-05-26 08:04:40 +01:00
Andrea Boriero
cc8aaab9ad
Fix multilineextractor erorr message when statements have no terminal chars
2020-05-21 12:58:47 +01:00
Andrea Boriero
88c653f6e3
Clean up after merge
2020-05-21 11:50:14 +01:00
Andrea Boriero
34fbba8815
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_42
2020-05-21 11:24:24 +01:00
Andrea Boriero
57ebf48b45
Merge branch 'master' into wip/6.0_merge_41
2020-05-21 10:57:03 +01:00
Steve Ebersole
50a5da07c1
HHH-14033 - SQL script parsing problem with multi-line comments
...
- Better handling of multi-line comments
- Restructured some internal classes to consolidate packages
- Added "system"-style SchemaToolingLogging
This commit:
- removed some temporary logging
- better comments in parsers
2020-05-20 07:13:41 -05:00
Steve Ebersole
7dfb0fdf24
HHH-14033 - SQL script parsing problem with multi-line comments
...
- Better handling of multi-line comments
- Restructured some internal classes to consolidate packages
- Added "system"-style SchemaToolingLogging
This commit:
- unifies handling of Antlr `-traceParser` across parsers
- adds comment crediting to Terrance Parr for the BLOCK_COMMENT lexer rule in the sql-script grammar
2020-05-20 07:02:20 -05:00
Steve Ebersole
b658e903d7
HHH-14033 - SQL script parsing problem with multi-line comments
...
- Better handling of multi-line comments
- Restructured some internal classes to consolidate packages
- Added "system"-style SchemaToolingLogging
2020-05-19 12:25:34 -05:00
Andrea Boriero
084f713949
HHH-13179 Fix license header
2020-05-18 18:42:31 +01:00
Davide D'Alto
e28d77ac33
Revert "HHH-13997 Use functions for the creation of ActionQueue and PersistenceContext"
...
This reverts commit 00acb1f213
.
2020-05-18 15:08:45 +01:00
Davide D'Alto
00acb1f213
HHH-13997 Use functions for the creation of ActionQueue and PersistenceContext
2020-05-18 14:31:53 +01:00
Davide D'Alto
9cd2236fd3
HHH-13997 : Add methods to SessionImpl and StatefulPersistenceContext; make Loader method protected
...
* Change visibility for Loader#registerNonExists
* Methods for creating PersistenceContext and ActionQueue
* Add StatefulPersistenceContext#initializeNonLazyCollections(Consumer<PersistentCollection> initializeAction)
2020-05-18 14:31:53 +01:00
Sanne Grinovero
2d7022ecec
HHH-14029 Generally improve handling of all post-load events
2020-05-18 14:15:34 +01:00
Sanne Grinovero
b08ae4cd14
HHH-14029 Improve 2LC post-load event invocations
2020-05-18 14:15:15 +01:00
Lars Karlström
02c3cc9e2e
HHH-13179 Fixed code formatting issue
2020-05-18 07:51:57 -05:00
Lars Karlström
4413433ace
HHH-13179 Subclass 2nd level caching now works for XML mappings
2020-05-18 07:51:57 -05:00
Davide D'Alto
88a712bab7
HHH-14024 Fix NativeSQLQueryPlanEqualsTest compilation error
2020-05-18 12:53:12 +01:00
gavinking
92b559abda
HHH-14024 add QueryPlanCreator functional interface
...
simplifies customization of HQLQueryPlan instantiation
2020-05-18 06:47:34 -05:00
Davide D'Alto
4a7f9ec0d6
HHH-14026 Change scope to protected for SessionImple#verifyImmutableEntityUpdate
2020-05-18 06:47:34 -05:00
Davide D'Alto
9fd9c0533d
HHH-14025 Add method to return the query statements for update queries
2020-05-18 06:47:34 -05:00
Davide D'Alto
42acc81067
HHH-14028 Change scope of various private methods to protected
...
So that Hibernate Reactive can reuse them.
2020-05-18 06:47:34 -05:00
Davide D'Alto
0633559f9f
HHH-14024 Allow the creation of a different QueryPlanCache
2020-05-18 06:47:34 -05:00
Davide D'Alto
d914c8aabc
HHH-14027 Allow the creation of a different QueryLoader
2020-05-18 06:47:34 -05:00
Davide D'Alto
5968044118
HHH-14024 Allow the creation of a different QueryPlan
2020-05-18 06:47:34 -05:00
Andrea Boriero
ee740d82fd
Fix compilation error after merging master
2020-05-14 10:14:43 +01:00
Andrea Boriero
257e479e92
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_39
2020-05-14 10:00:59 +01:00
Sanne Grinovero
e23dad19ca
HHH-14019 Adding some comments to the new SPI
2020-05-13 22:29:41 +01:00
gavinking
137c524a14
HHH-14019 Allow customizing the Database target in the Schema Management tool
...
Add an API allowing Hibernate Reactive to plug in to schema export:
we've decided that HR should not use JDBC for schema export
2020-05-13 22:25:25 +01:00
Sanne Grinovero
cb4909a5e1
HHH-14004 Attempt to load from 2LC when initializing an Enhanced Proxy
2020-05-13 21:33:01 +01:00
Sanne Grinovero
947dda618e
HHH-14004 Test for Cacheable Enhanced Proxies
2020-05-13 21:33:01 +01:00
Steve Ebersole
ab71b369b6
Removed no-longer relevant code comment
2020-05-12 21:16:33 -05:00
Nathan Xu
fa6acf4e50
fix an obvious bug in SqmSelectClause
2020-05-12 21:16:33 -05:00
Andrea Boriero
0e1713a3a0
HHH-13936 Add additional test
2020-05-12 10:55:39 +01:00
Jonathan Bregler
fa4ead1baa
HHH-13996: Update documentation for HANA Cloud
2020-05-11 22:39:04 +01:00
Yoann Rodière
1a28fd419e
HHH-14006 Test extended bytecode enhancement for mapped superclasses and entity superclasses
2020-05-11 22:15:14 +01:00
Yoann Rodière
5c5b347614
HHH-14006 Take inherited fields into account in extended bytecode enhancement
2020-05-11 22:15:14 +01:00
Sanne Grinovero
bc12eee661
Revert "HHH-13950 Update to Bean Validation 3 preview: Hibernate Validator 7.0.0.Alpha1"
...
This reverts commit b9a24f458c
.
2020-05-11 18:00:20 +01:00
Sanne Grinovero
6dd7d09ba0
Revert "HHH-13950 Apply the mass replace script to switch to Jakarta Validation API"
...
This reverts commit 60abc8aa76
.
2020-05-11 18:00:07 +01:00
michiel.hendriks
585ca8e2bf
HHH-13936 Call pulseTransactionCoordinator before checking for transaction in flush()
2020-05-11 16:01:43 +01:00
Nathan Xu
5c11778032
replace 'AtomicInteger' with 'MutableInteger' in single thread scenario
2020-05-10 17:48:06 -04:00
Andrea Boriero
72bf70f013
Fix issue with Column size detection causing errors during schema generation
2020-05-07 14:32:34 +01:00
Andrea Boriero
4e6011d093
Fix EntityInitializer double registration
2020-05-07 13:34:27 +01:00
Andrea Boriero
35a4c42347
Fix merge compilation errors
2020-05-05 10:58:42 +01:00
Andrea Boriero
5d572cc876
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_37
2020-05-05 09:21:34 +01:00
Steve Ebersole
e38a4de536
Verified and fixed BasicValue resolutions based on type-defs and UserTypes
2020-05-01 11:29:44 -05:00
Sanne Grinovero
2c12ca401d
HHH-13995 Remove dead code from StandardBasicTypes
2020-04-30 19:20:23 +01:00
Sanne Grinovero
922ec04422
HHH-13994 Bootstrap analysis: avoid initializing unused JtaPlatform classes
2020-04-30 19:20:23 +01:00
Sanne Grinovero
49405effce
HHH-13993 Bootstrap analysis: avoid initializing many Dialect classes
2020-04-30 19:20:22 +01:00
Steve Ebersole
41093ae66c
* Added JpaCompliance for @OrderBy handling
...
* Added `NonTransientException` checked during MappingModelCreationProcess "post init callback" handling to indicate non-recoverable errors
* Redesigned `MappingModelCreationProcess#executePostInitCallbacks` to account for `NonTransientException`
2020-04-30 09:13:37 -05:00
Sanne Grinovero
41cd5ab359
HHH-13976 Some javadoc clarifications and code style adjustments
2020-04-30 14:43:33 +01:00
barreiro
4d0bd0f080
HHH-13976 Introduce BEFORE_TRANSACTION_COMPLETION release mode
2020-04-30 14:43:27 +01:00
Steve Ebersole
0bfef60c25
tests for `@AssociationOverride`
2020-04-29 14:50:43 -05:00
Steve Ebersole
4755e19964
* Verified / implemented query-result cache support - improved fetch test checks
2020-04-29 13:19:45 -05:00
Steve Ebersole
1f1f5f118b
* Verified named "result mapping" support - e.g. JPA's `@SqlResultMapping`; gets stored correctly, but can't test it getting applied correctly until after native-query support is implemented
...
* Verified / implemented query-result cache support
2020-04-29 13:12:45 -05:00
Andrea Boriero
250160d923
HHH-13986 Fix test failure on MariaDB
2020-04-29 11:12:35 +01:00
Andrea Boriero
ac4af03ea3
Fix checkstyle error
2020-04-29 08:11:22 +01:00
Andrea Boriero
859ffb608a
HHH-13986 SequenceHiLoGeneratorNoIncrementTest is not testing the right Optimiser
2020-04-28 17:48:28 +01:00
Steve Ebersole
75bfc096ef
Verified `@NamedQuery` support
2020-04-28 11:23:24 -05:00
Steve Ebersole
933788789d
* enable additional HBM tests
...
* fixed minor bug
* re-organized tests related to mapping assertions
2020-04-28 10:50:09 -05:00
Steve Ebersole
1aab2219ce
* enable additional HBM tests
...
* fixed minor bug
* re-organized tests related to mapping assertions
2020-04-28 10:48:21 -05:00
Steve Ebersole
96f4a350e0
* HBM mappings
...
* dynamic models
* initial non-aggregated cid support
2020-04-27 15:21:09 -05:00
Nathan Xu
9ef62f1fb8
implement @where and @whereJoinTable
2020-04-24 13:23:37 -05:00
Nathan Xu
f919358e0c
make use of Collections.addAll() for better performance
2020-04-24 13:22:53 -05:00
Andrea Boriero
72f8c079e9
Revert "HHH-13950 Update to Bean Validation 3 preview: Hibernate Validator 7.0.0.Alpha1"
...
This reverts commit b9a24f458c
.
2020-04-24 13:56:53 +01:00
Andrea Boriero
3bc33221f0
Revert "HHH-13950 Apply the mass replace script to switch to Jakarta Validation API"
...
This reverts commit 60abc8aa76
.
2020-04-24 13:26:37 +01:00
gavinking
01d3485970
Add rollup() and cube() for group by clause
...
This syntax is supported on at least DB2, Oracle, SQL Server, and
Postgres. It's not supported on MySQL.
2020-04-22 15:09:05 -05:00
Steve Ebersole
08bf2bb906
HHH-13890 : Add support for custom EventType and listeners - EventEngine
2020-04-22 13:26:22 -05:00
Andrea Boriero
9ec19e3c65
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_36
2020-04-22 15:15:10 +01:00
Steve Ebersole
5d9c25c318
`@JavaTypeRegistration` and `@SqlTypeRegistration` support
2020-04-21 18:58:47 -05:00
Nathan Xu
686a519680
implement @Filter for HQL/Criteria
2020-04-21 17:08:19 -05:00
Steve Ebersole
709e7d49b7
minor fix-up
2020-04-21 16:50:04 -05:00
Steve Ebersole
afff2d0cfe
minor fix-up
2020-04-21 16:46:05 -05:00
Andrea Boriero
8d026b05d2
Fix extra query executed for Embedded fk when embeddable has a lazy ToOne association
2020-04-21 16:46:05 -05:00
Andrea Boriero
99778fd9a1
Composite Foreign Key for EmbeddedId removed unnecessary join for Embeddable with ManyToOne
2020-04-21 16:46:05 -05:00
Andrea Boriero
e5a2b582fe
Removed ForeignKeyDescriptor direction attribute
2020-04-21 16:46:05 -05:00
Andrea Boriero
7f4c25095e
Implement Composite Foreign Key for EmbeddedId
2020-04-21 16:44:03 -05:00
Gail Badner
903bb292e7
HHH-13916 : Add a unique Session "token"
2020-04-21 16:26:40 -05:00
Nathan Xu
7bca059f94
replace '\n' with platform specific char in both SqmTreePrinter and SqlTreePrinter
2020-04-21 16:24:52 -05:00
Nathan Xu
23719ff481
implement readonly loader feature
2020-04-21 16:23:39 -05:00
Steve Ebersole
ced4f5e602
Various changes around how basic values are handled in terms of mapping consumption for annotations and how value conversions happen
...
* Split BasicType "resolution" into 2 - one used for reading (mapping model) versus one used from writing (legacy persister model)
* @SqlTypeCode, @SqlType, @SqlTypeRegistration
* @JavaType, @JavaTypeRegistration
* @Mutability
* jdbc_mappings.adoc section for DomainModel chapter
[*] At the moment, neither @SqlTypeRegistration nor @JavaTypeRegistration support has been implemented
[*] Still need to make sure @Mutability is propogated properly in all the cases
[*] jdbc_mappings.adoc still needs a lot of attention
2020-04-21 16:09:46 -05:00
Panagiotis Sotiropoulos
55e54795c3
HHH-13960 Add SAXReader sec features to match the defaults
2020-04-21 10:49:59 +01:00
Nathan Xu
52a101291d
fix a RE sloppiness in IndexQueryHintHandler
2020-04-20 13:29:59 -05:00
gavinking
5e53f2130e
Also fix spelling error in method name
...
Caught by @NathanQingyangXu
2020-04-20 13:11:43 -05:00
gavinking
d3d92f9a95
Use lambda syntax to instantiate SQLExceptionConversionDelegates
...
Especially remove the amazingly verbose CacheSQLExceptionConversionDelegate
2020-04-20 13:11:42 -05:00
gavinking
5fc35980fd
Clean up ViolatedConstraintNameExtract-o-rs
...
- Fix the spelling error in the name of this hierarchy
- Use delegation to an anonymous function instead of overriding in
TemplateViolatedConstraintNameExtractor
2020-04-20 13:06:00 -05:00
Andrea Boriero
56873732b7
Fix errors after merge
2020-04-20 14:10:07 +01:00
Andrea Boriero
88d65adafb
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_35
2020-04-20 13:44:39 +01:00
Andrea Boriero
0a5ae91c08
fix errors after merge
2020-04-20 12:37:33 +01:00
Andrea Boriero
a0b4566264
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_34
2020-04-20 12:17:22 +01:00
Sanne Grinovero
60abc8aa76
HHH-13950 Apply the mass replace script to switch to Jakarta Validation API
...
For reference, this is the script being applied:
find . -type f -name '*\..java' -o -name '*.\.adoc' -o -name '*.\.gradle' | xargs sed -i 's/javax\.validation/jakarta\.validation/g'
2020-04-20 12:16:36 +01:00
Sanne Grinovero
b9a24f458c
HHH-13950 Update to Bean Validation 3 preview: Hibernate Validator 7.0.0.Alpha1
...
We apply the update int two steps:
- some hand-rolled changes, such as switching the dependency to the new Hibernate Validator preview build
- running a replace-all scripts
This individual commit represents the first set of changes.
When porting this change to a different branch, this one should be cherry picked while the second change
is better ported by running the same script once again.
2020-04-20 12:14:24 +01:00
Andrea Boriero
32e4a16623
Fix merge issues
2020-04-17 15:03:19 +01:00
Andrea Boriero
7ced01d303
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_32
2020-04-17 14:39:36 +01:00
Sanne Grinovero
3f2a4947a7
HHH-13952 Remove dependency to Arquillian as its no longer used
2020-04-17 14:27:19 +01:00