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

rombert pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git.


      at 20cecea  SLING-7187 - handle conflicts between annotations

This branch includes the following new commits:

     new 547e157  SLING-3313 - adding initial version of Sling Models (nee YAMF)
     new 644e862  SLING-3313 - actually use the seal() method to make the 
disposal callback list unmodifiable
     new 48957a5  SLING-3335 - add a models configuration printer to see the 
currently registered injectors
     new 2a77d74  SLING-3334 - explicitly rank injectors
     new 7e0029c  SLING-3357 - allow a model class to have a single argument 
constructor which takes the adaptable as a parameter.
     new ba7b6f4  using release version
     new d80f143  avoid the use of Integer.compare()
     new 73a677e  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.0.0
     new 7bac1bc  [maven-release-plugin] prepare for next development iteration
     new fe7d4e1  Using 1.0.0 breaks the build, reverting to SNAPSHOT, we might 
change back to 1.0.0 once it's out
     new a666ecf  SLING-3429 - fix NPE in OSGiServiceInjector which impacted 
multi-valued properties
     new f12ac6a  SLING-3430 - only embedding necessary parts of beanutils
     new 6e36336  SLING-3340 - reverting change to restrict inclusion of 
beanutils. error prone.
     new 1b0d640  no need to depend upon SNAPSHOT version of API
     new 852d7c7  adding test for array properties
     new 0536965  SLING-3455 - fixing issue with injection adaption in classes
     new 56360a6  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.0.2
     new 729cfe0  [maven-release-plugin] prepare for next development iteration
     new 12e9536  SLING-3460 - internal refactoring to ease meta-annotation 
support
     new 6696449  Update to parent pom v19
     new bc322c5  SLING-3510 - checking for bad package, either one which 
doesn't exist or doesn't have classes in it. Thanks Chris Pilsworth for the 
patch!
     new 2292940  SLING-3536 - on each interval for callback disposal, continue 
to poll until all queue is exhausted.
     new 1f27b68  fixing bad url
     new 8a48f85  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.0.4
     new 6a651c3  [maven-release-plugin] prepare for next development iteration
     new b8655b7  SLING-3547 - correctly dealing with primitive and wrapper 
default objects. applying slightly modified version of patch from Konrad to 
split out primitive from wrapper model classes.
     new 2f9dc8f  unit test improvements
     new 54467a8  SLING-3499 - adding support for custom annotation per 
injector (thanks Konrad Windszus for the patch!)
     new fde3394  cleanup
     new d5c9eda  SLING-3674 - automatically wrapping/unwrapping arrays where 
possible during value map injection
     new 8295680  SLING-3674 - avoiding duplicating code in ClassUtils
     new 46a107f  SLING-3516 - adding ability to inject a list of grandchild 
resources. Thanks to Igor Sechyn for the initial patch!
     new 4675a15  SLING-3683 - breaking apart annotation processor factory 
selection from injector selection
     new 2fc4821  trivial formatting
     new 90874bd  SLING-3696 - adding support for defining a default injection 
strategy of required or optional. Also adding a @Required annotation
     new 145dc1d  SLING-3677 - converting arrays to lists in ValueMapInjector. 
Thanks to Krystian Panek for the patch!
     new 6154377  SLING-3700 - adding a ResourceResolver injector
     new d732347  using released version of API
     new 31d2f27  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.0.6
     new fbb9f6e  [maven-release-plugin] prepare for next development iteration
     new 4905f62  using next version during release
     new 1b3662b  SLING-3703 - referencing older version of commons osgi
     new 92476e5  Updated to parent version 20
     new d5e1828  SLING-3716 SLING-3718 - adding support for constructor 
injection and self injection based on a patch from Stefan Seifert
     new 3584695  SLING-3861 - adding condition option for @Model annotation
     new 2d51f72  SLING-3863 - adding initial values for primitives when 
injecting to fields and constructor params. Thanks to Stefan Seifert for the 
original patch!
     new 5351343  SLING-3863 - correcting behavior where optional methods and 
constructor parameters were injected with non-null wrapper classes.
     new ed9305f  SLING-3869 - fixing branding issues with Sling Models. Thanks 
to Stefan Seifert for the patch!
     new 0f0f749  fixing error in Sling Models test code - service ranking must 
be an integer to be effective
     new 71a12ec  SLING-3876 - ensuring that class-based self injection only 
happens on the first constructor parameter. Otherwise the @Self annotation is 
necessary. Also changing the ranking so that other injectors have the 
opportunity to inject to the first constructor parameter before.
     new fe148d7  SLING-3877 - adding a resource path injector. also did some 
minor refactoring to avoid code duplication between injectors.
     new 7a3f6c7  SLING-3860 - allowing maximum recursion depth to be configured
     new 0b6a0bd  SLING-3878 - allowing the injection of parameterized request 
attributes
     new 45af5c6  SLING-3715 - adding sling object injector. Thanks to Stefan 
for the patch!
     new 5e6f116  SLING-3879 - fixing NPE in PathInjector. Thanks Stefan for 
the patch!
     new 7db6cf4  SLING-3894 - removing duplicate type checks in Request and 
SlingBindings injectors
     new 8d30771  SLING-3895 - supporting list adaptation for method and 
constructor injection
     new 35ac401  SLING-3897 - fixing copy&paste error in unbind method. Thanks 
to Stefan for the patch!
     new 17ad7cf  SLING-3897 - fixing synchronization block error
     new 0fdaa1f  SLING-3886 - adding support for adapter indirection where the 
adapting target is a superclass or implemented interface of the implementation 
class. Thanks to Stefan for the patch!
     new 62d308e  release prep
     new 3b548db  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.1.0
     new 036ab2e  [maven-release-plugin] prepare for next development iteration
     new 76bb7aa  using next snapshot during release
     new d706c17  formatting
     new e3d961e  SLING-3911 - fixing issue where empty or wrong arrays are 
specified for default values
     new 646afdf  remove @SuppressWarnings("javadoc") from unit test files 
(most of them where added by my patches) - this is not usual in the other 
sources
     new a2710c0  remove log member variable which is not used currently
     new 11fbd20  Update to Sling Parent POM 22 with baselining enabled
     new 45570da  SLING-3923 - fixing multiple calls to post construct method 
with patch from Konrad Windszus. Thanks! This closes #27
     new 56d2301  SLING-3709 - introduce new ModelFactory service interface 
which throws various exceptions based on failure conditions. Thanks to Konrad 
Windszus for the original patch!
     new 12e8bcb  SLING-3709 - adding additional testing for missing elements 
and post construct failures
     new 5db955a  reformat list of enums (no code change)
     new e55e0fb  SLING-4057 ModelFactory: Ordering of method arguments 
inconsistent
     new 2dcac9b  move detailed JavaDoc description of SlingObject injector 
support to annotation, because this is what's usually only included as 
dependency in the projects
     new 4711842  remove auto-generated TODO tag
     new 31c61c5  SLING-4083 Enable SlingObject injector to inject all context 
objects when a request is attached to the current thread
     new 52c2d70  SLING-4083 add missing "test" scope
     new fb05078  SLING-4083 fix comment
     new ea2d502  SLING-4056 ModelFactory.canCreateFromAdaptable reports false 
errors when using "adapters" on models (patch suppplied by Konrad Windszus)
     new b1e314b  SLING-4083 revert all changes from trunk, copied to branch 
https://svn.apache.org/repos/asf/sling/whiteboard/sseifert/SLING-4083_models_slingobject_threadlocal
     new 97182c5  SLING-4112 Sling Models: Optimize performance when read sling 
models annotations
     new 9831e41  SLING-4155, consider default injection strategy also for 
injector-specific annotations
     new 8510452  SLING-4192, fix typo in ModelAdapterFactory
     new 6d98ca0  SLING-4195 array initialized to wrong size due to typo
     new c4a9f67  SLING-4161 support Sling Validation by a new field on the 
Model annotation
     new b0d3a32  cosmetic: eliminate some unused imports
     new 1621926  SLING-4059 Sling Models: ResourceResolverInjector is obsolete
     new 02c4d66  SLING-4112 make sure all variants of 
InjectAnnotationProcessorFactory are displayed in configuration printer
     new 617eea5  eliminate deprecation warnings by adding @SuppressWarning 
annotations
     new bc8ff43  SLING-4212 Sling Models: Allow multiple values from ValueMap 
in the resource-path injector (applied patch by santiago garcía pimentel with 
some modifications)
     new 8c92aa9  SLING-4373 throw IAE in case null is given as parameter to 
createModel
     new d758703  SLING-4432 Sling Models: Include more specific information in 
model adaption failure log messages
     new 0efbfb5  SLING-4447 provide a SlingModels Sightly UseProvider which 
throws exceptions in case a Sling Model cannot be instantiated instead of 
falling back to the simple Pojo instantiation.
     new 9c88174  SLING-4432 Sling Models: Include more specific information in 
model adaption failure log messages
     new 557ff07  SLING-4447, rely on released version of Sightly to fix build 
errors related to SNAPSHOT not being available
     new 997c9d6  SLING-4618 - Remove dependency to unexported class
     new f03ac02  Add missing licence headers
     new 6534ebf  SLING-4447 move Sightly Use Provider for Models into 
dedicated bundle
     new 0b71aae  SLING-4698 - Set parent.relativePath to empty for all modules
     new 0672bbd  SLING-4155 fix typo in annotation property: injectonStrategy 
=> injectionStrategy
     new a5e3009  SLING-4630 Avoid logging an failure that is thrown as 
exception in ModelFactory.createModel (patch supplied by Georg Henzler)
     new 51d5f88  SLING-3709 improve exception handling by using dedicated 
exception classes instead of the one global result object
     new 5eaf41a  removed unused imports
     new e231eb4  SLING-3709 remove @Nonnull annotation to fix build
     new 9c73fb4  SLING-4737 add missing JSR 305 annotations
     new d0cc563  SLING-4737 fix some warnings in test classes due to new JSR 
305 annotations
     new c4a53bf  SLING-4737, fix some more JSR 305 annotation warnings
     new c1ce3ff  SLING-4737 add explicit dependency on JSR 305 annotations
     new df1255f  SLING-4767
     new 98485b9  SLING-4161 move validation to separate bundle
     new 755098d  SLING-4161 log validation errors only with level debug
     new 0b34059  SLING-4779 rely on RankedServices
     new 0847acb  remove some unused imports
     new c2e57b4  fix javadoc errors so java 8 is not complaining
     new 818bd7f  update to released API version
     new 0b60562  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.2.0
     new 3e46fda  [maven-release-plugin] prepare for next development iteration
     new 9496d74  update to latest snapshot versions
     new 0988172  Update to Sling Parent 23
     new cca61b7  Remove superflous sling.java.version=6 as it's the default now
     new b372c0a  set parent version to 24 and add empty relativePath where 
missing
     new bfd71e0  SLING-5010 Sling Models: Stale 
StaticInjectionAnnotationProcesssorFactory list depending on bundle startup 
order
     new 5a77660  SLING-4997 add new method isModelClass and deprecate the old 
one
     new 8bf80e4  update to API release version
     new 4cb33c5  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.2.2
     new 4e0f2e0  [maven-release-plugin] prepare for next development iteration
     new 8317756  update to next snapshot version until releases are available 
in maven central
     new 185db29  SLING-5032 - Even if a field is annotated with Source the 
ModelAdapterFactory will query all injectors
     new 56e7902  trivial: minor code cleaning
     new 18b0788  Update the main reactor to parent 25
     new b548eda  SLING-5187 - Missing metatype name for ModelAdapterFactory
     new 6e0e1c8  switch back api dependency to latest released version
     new 911f7d4  cosmetic: eliminate some warnings
     new 6ac4edb  SLING-5032 make access to injectors concurrent map atomic to 
ensure thread safety of bind/unbind methods remove code redundancy in 
injectElement method when iterating over the injectors to process
     new 9839d34  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.2.4
     new e6bf28d  [maven-release-plugin] prepare for next development iteration
     new 68d519a  Switch to parent pom 26
     new bc8f417  SLING-5389 improve logging in case of errors
     new e905ced  SLING-5389 - also log injection exceptions with level debug 
in case the injection is optional
     new caf6d00  SLING-5029 - clarify ModelFactory.canCreateFromAdaptable to 
always return false in case the according adapter factory is not available (for 
whatever reason)
     new de54ff0  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.2.6
     new 3f32f58  [maven-release-plugin] prepare for next development iteration
     new 5bcb784  simplify code (inline method)
     new f636c73  SLING-5555 Make error message more explicit when a @Source 
annotation contains an invalid source identifier
     new a9f2a7c  SLING-5661 Fix typo in Result#wasSuccessfull():boolean
     new dbc6bac  SLING-5664 consider service ranking when injecting OSGi 
services
     new 398ddcf  SLING-5710 - fixing issue where super interface methods 
weren't injected
     new 614a8f6  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.2.8
     new 640a173  [maven-release-plugin] prepare for next development iteration
     new dee1769  SLING-5726 allow both ValueMapInjector and 
ResourcePathInjector to act on adaptable SlingHttpServletRequest in all 
circumstances
     new 17c97ad  SLING-5726 reverting r1743648
     new 2794bb4  SLING-5865 Models Impl: Update to 
org.apache.sling.commons.osgi 2.4.0
     new f963668  SLING-5992 - Introduce resource type to model class binding
     new 427d83d  cosmetic: eliminate some code warnings (no functional change)
     new 239fd08  SLING-6183 - add Sling Model Exporter feature
     new a60877d  use released api
     new 2f082ab  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.3.0
     new 49c0630  [maven-release-plugin] prepare for next development iteration
     new 82a8aaf  switch to next snapshot version until released versions are 
available in maven central
     new e24e3c3  SLING-6294 - fixing bad error messages in ExportServlet
     new 7102caf  SLING-6298 - register module using first adapter type rather 
than implementation type
     new 10f0602  using released api
     new 49ef59b  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.3.2
     new 908f0d4  [maven-release-plugin] prepare for next development iteration
     new f306e49  SLING-6309 - better job name for service disposal
     new 77e74c6  SLING-6308 - support explicit class names in bundle header
     new 9106f0a  SLING-6310 - clear disposal queue on component deactivation
     new 71f5f66  SLING-6311 - allow the cleanup job interval period to be 
configured.
     new 93a1e7b  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.3.4
     new 0c9c0d1  [maven-release-plugin] prepare for next development iteration
     new 04f7bde  SLING-6318 - internal optimization to avoid repeated 
retrieval of ValueMap from Resource
     new 82c8cae  SLING-6346 - fixing null return for sling models adapting 
from SlingHttpServletRequest
     new 6e718fe  SLING-6318 - improve optimization by avoiding null return 
values from prepareValues
     new d9c6b97  SLING-6341 - fix array support for resource path injector 
with patch from Santiago García Pimentel
     new e428f68  SLING-6354 - fix support for SlingBindings injections in 
ExportServlet
     new 722162e  SLING-6366 - add new data to Sling Models Configuration 
Printer
     new 555b95f  internal variable rename
     new d338562  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.3.6
     new 84de65b  [maven-release-plugin] prepare for next development iteration
     new dcb4e03  SLING-6376 log correct types when adapting within a 
collection failed for some reason
     new 3f07c44  SLING-6377 always try to adapt via ModelFactory means if 
possible to correctly expose the underlying exception
     new b65c1c3  really only log exception in case the default injection was 
successful
     new faa44f4  SLING-6369 MissingElementsException should not hide any stack 
traces of contained exceptions
     new 59e09d5  SLING-6409 Models Impl: Use shading instead of embedding for 
commons.osgi and scripting.core
     new e2517f9  cosmetic: remove some unused imports/eliminate warnings
     new c1d73f1  SLING-6409 shade beanutils as well, and fix package imports
     new ecd5605  SLING-6409 fix filter expressions
     new bf9241c  SLING-6409 switch back to bnd embend for commons-beanutils
     new 1a7972a  update to latest API release
     new e016a7b  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.3.8
     new d8adb0c  [maven-release-plugin] prepare for next development iteration
     new 77e82cf  found issue in integration test - rollback release
     new 99ee62a  SLING-6409 make recolate expression for 
org.apache.sling.scripting.core more explicit to relocate only internal package
     new 9478e84  update to latest API release
     new 44783f8  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.3.8
     new 389d7e6  [maven-release-plugin] prepare for next development iteration
     new 61dc0eb  update to next snapshot version until releases are available 
on maven central
     new 1d2bb13  SLING-6584 - synchronize setAccessible calls
     new d5ab498  SLING-6658 - always include implementation class in 
adapterTypes list. Thanks to Dirk Rudolph for the patch!
     new 1907f07  SLING-6652 - allow for multiple classes to export the same 
resourceType
     new 1c7f35d  SLING-6748 - move ValuePreparer to API
     new c6813f7  SLING-6764 - Guard against reflection failures when 
registering Sling Model classes
     new f007103  Merge branch 'via-resource-type-force'
     new 6f31147  SLING-6785 - support caching for adaptations
     new ebe7bab  use released api
     new 34f5d4a  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.4.0
     new 8f0eeaa  [maven-release-plugin] prepare for next development iteration
     new 37a41f2  Switch to snapshot for API dependency until vote is in 
progress
     new 72b00d2  SLING-6815 - add allow private package registration property 
to Sling Models registered Adapter Factories
     new 600cb28  SLING-6818 - only attach the sources jar generated by the 
shade plugin
     new 0b4b45e  cosmetic: eliminate unused imports
     new c7b8fca  cosmetic: remove dead code
     new 09a984f  SLING-6846 Sling Models Impl: Avoid exceptions when resource 
has no resource type
     new 37dd023  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.4.2
     new dbe0d53  [maven-release-plugin] prepare for next development iteration
     new d3313cc  Merge branch 'SLING-7015'
     new 7ed5d28  SLING-7040 : Update commons lang 2.x to 3.5
     new a8fa9ea  SLING-7049 - MissingExporterException thrown when the desired 
ModelExporter is not the first in the list
     new 6512124  use released version
     new d3b8f9c  [maven-release-plugin] prepare release 
org.apache.sling.models.impl-1.4.4
     new e2e8a41  [maven-release-plugin] prepare for next development iteration
     new 23c2611  update to latest snapshot version until release is available 
on maven central
     new 0cf38ee  SLING-7124 - allow PostConstruct method to return a boolean 
to indicate a failure
     new 5c651fb  SLING-7167 Adjust READMEs
     new 0c7661a  SLING-7167 Adjust READMEs
     new 8990421  SLING-7174 - catch Exception in ExportServlet when accessing 
reader
     new 912ae99  SLING-7167 Adjust READMEs
     new 20cecea  SLING-7187 - handle conflicts between annotations

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


-- 
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].

Reply via email to