[cdi-api] 05/09: Merge tag 'upstream/1.2'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jul 5 12:23:59 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository cdi-api.

commit f2780607cc00836c84e97bb0a12bddac2f233d1b
Merge: e5ea763 96732ab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 5 11:29:35 2017 +0200

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2

 .gitignore                                         |   11 +
 META-INF/DEPENDENCIES.txt                          |   22 -
 META-INF/LICENSE.txt                               |  201 ---
 META-INF/MANIFEST.MF                               |    6 -
 README.md                                          |    6 +
 api/pom.xml                                        |  253 ++++
 api/src/ide/eclipse/jboss_community_formatter.xml  |  279 +++++
 .../src/main/java/javax}/decorator/Decorator.java  |    0
 .../src/main/java/javax}/decorator/Delegate.java   |    0
 .../main/java/javax}/decorator/package-info.java   |    0
 .../enterprise/context/ApplicationScoped.java      |    0
 .../context/BusyConversationException.java         |    0
 .../enterprise/context/ContextException.java       |    0
 .../context/ContextNotActiveException.java         |    0
 .../javax}/enterprise/context/Conversation.java    |    0
 .../enterprise/context/ConversationScoped.java     |    0
 .../java/javax}/enterprise/context/Dependent.java  |    0
 .../java/javax}/enterprise/context/Destroyed.java  |    0
 .../javax}/enterprise/context/Initialized.java     |    0
 .../context/NonexistentConversationException.java  |    0
 .../javax}/enterprise/context/NormalScope.java     |    0
 .../javax}/enterprise/context/RequestScoped.java   |    0
 .../javax}/enterprise/context/SessionScoped.java   |    0
 .../javax}/enterprise/context/package-info.java    |    0
 .../enterprise/context/spi/AlterableContext.java   |    0
 .../javax}/enterprise/context/spi/Context.java     |    0
 .../javax}/enterprise/context/spi/Contextual.java  |    0
 .../enterprise/context/spi/CreationalContext.java  |    0
 .../enterprise/context/spi/package-info.java       |    0
 .../main/java/javax}/enterprise/event/Event.java   |    0
 .../javax}/enterprise/event/ObserverException.java |    0
 .../java/javax}/enterprise/event/Observes.java     |    0
 .../java/javax}/enterprise/event/Reception.java    |    0
 .../javax}/enterprise/event/TransactionPhase.java  |    0
 .../java/javax}/enterprise/event/package-info.java |    0
 .../java/javax}/enterprise/inject/Alternative.java |    0
 .../inject/AmbiguousResolutionException.java       |    0
 .../main/java/javax}/enterprise/inject/Any.java    |    0
 .../enterprise/inject/CreationException.java       |    0
 .../java/javax}/enterprise/inject/Decorated.java   |    0
 .../java/javax}/enterprise/inject/Default.java     |    0
 .../java/javax}/enterprise/inject/Disposes.java    |    0
 .../enterprise/inject/IllegalProductException.java |    0
 .../enterprise/inject/InjectionException.java      |    0
 .../java/javax}/enterprise/inject/Instance.java    |    0
 .../java/javax}/enterprise/inject/Intercepted.java |    0
 .../main/java/javax}/enterprise/inject/Model.java  |    0
 .../main/java/javax}/enterprise/inject/New.java    |    0
 .../java/javax}/enterprise/inject/Produces.java    |    0
 .../enterprise/inject/ResolutionException.java     |    0
 .../java/javax}/enterprise/inject/Specializes.java |    0
 .../java/javax}/enterprise/inject/Stereotype.java  |    0
 .../enterprise/inject/TransientReference.java      |    0
 .../main/java/javax}/enterprise/inject/Typed.java  |    0
 .../inject/UnproxyableResolutionException.java     |    0
 .../inject/UnsatisfiedResolutionException.java     |    0
 .../main/java/javax}/enterprise/inject/Vetoed.java |    0
 .../javax}/enterprise/inject/package-info.java     |    0
 .../enterprise/inject/spi/AfterBeanDiscovery.java  |    0
 .../inject/spi/AfterDeploymentValidation.java      |    0
 .../enterprise/inject/spi/AfterTypeDiscovery.java  |    0
 .../javax}/enterprise/inject/spi/Annotated.java    |    0
 .../enterprise/inject/spi/AnnotatedCallable.java   |    0
 .../inject/spi/AnnotatedConstructor.java           |    0
 .../enterprise/inject/spi/AnnotatedField.java      |    0
 .../enterprise/inject/spi/AnnotatedMember.java     |    0
 .../enterprise/inject/spi/AnnotatedMethod.java     |    0
 .../enterprise/inject/spi/AnnotatedParameter.java  |    0
 .../enterprise/inject/spi/AnnotatedType.java       |    0
 .../java/javax}/enterprise/inject/spi/Bean.java    |    0
 .../enterprise/inject/spi/BeanAttributes.java      |    0
 .../javax}/enterprise/inject/spi/BeanManager.java  |    0
 .../enterprise/inject/spi/BeforeBeanDiscovery.java |    0
 .../enterprise/inject/spi/BeforeShutdown.java      |    0
 .../java/javax}/enterprise/inject/spi/CDI.java     |    0
 .../javax}/enterprise/inject/spi/CDIProvider.java  |    0
 .../javax}/enterprise/inject/spi/Decorator.java    |    0
 .../enterprise/inject/spi/DefinitionException.java |    0
 .../enterprise/inject/spi/DeploymentException.java |    0
 .../enterprise/inject/spi/EventMetadata.java       |    0
 .../javax}/enterprise/inject/spi/Extension.java    |    0
 .../enterprise/inject/spi/InjectionPoint.java      |    0
 .../enterprise/inject/spi/InjectionTarget.java     |    0
 .../inject/spi/InjectionTargetFactory.java         |    0
 .../enterprise/inject/spi/InterceptionType.java    |    0
 .../javax}/enterprise/inject/spi/Interceptor.java  |    0
 .../enterprise/inject/spi/ObserverMethod.java      |    0
 .../enterprise/inject/spi/PassivationCapable.java  |    0
 .../inject/spi/ProcessAnnotatedType.java           |    0
 .../javax}/enterprise/inject/spi/ProcessBean.java  |    0
 .../inject/spi/ProcessBeanAttributes.java          |    0
 .../inject/spi/ProcessInjectionPoint.java          |    0
 .../inject/spi/ProcessInjectionTarget.java         |    0
 .../enterprise/inject/spi/ProcessManagedBean.java  |    0
 .../inject/spi/ProcessObserverMethod.java          |    0
 .../enterprise/inject/spi/ProcessProducer.java     |    0
 .../inject/spi/ProcessProducerField.java           |    0
 .../inject/spi/ProcessProducerMethod.java          |    0
 .../enterprise/inject/spi/ProcessSessionBean.java  |    0
 .../inject/spi/ProcessSyntheticAnnotatedType.java  |    0
 .../javax}/enterprise/inject/spi/Producer.java     |    0
 .../enterprise/inject/spi/ProducerFactory.java     |    0
 .../enterprise/inject/spi/SessionBeanType.java     |    0
 .../javax}/enterprise/inject/spi/Unmanaged.java    |    0
 .../enterprise/inject/spi/WithAnnotations.java     |    0
 .../javax}/enterprise/inject/spi/package-info.java |    0
 .../javax}/enterprise/util/AnnotationLiteral.java  |    0
 .../java/javax}/enterprise/util/Nonbinding.java    |    0
 .../java/javax}/enterprise/util/TypeLiteral.java   |    0
 .../java/javax}/enterprise/util/package-info.java  |    0
 api/src/main/javadoc/overview.html                 |   54 +
 .../src/main/resources/beans_1_0.xsd               |    0
 .../src/main/resources/beans_1_1.xsd               |    0
 .../jboss/cdi/api/test/AnnotationLiteralTest.java  |   29 +
 api/src/test/java/org/jboss/cdi/api/test/Foo.java  |   27 +
 api/src/test/resources/full-beans-1_1.xml          |   25 +
 pom.xml                                            |   22 +
 release-utils.sh                                   |  106 ++
 release.sh                                         |   86 ++
 spec/README.md                                     |    8 +
 spec/asl2/pom.xml                                  |   22 +
 spec/jcp/pom.xml                                   |   22 +
 spec/parent/pom.xml                                |  205 ++++
 spec/pom.xml                                       |   27 +
 spec/src/main/doc/architecture.asciidoc            |  582 +++++++++
 spec/src/main/doc/cdi-spec.asciidoc                |   29 +
 spec/src/main/doc/custom-asciidoc-dblatex.sty      |   57 +
 spec/src/main/doc/decorators.asciidoc              |  198 +++
 spec/src/main/doc/definition.asciidoc              |  841 +++++++++++++
 spec/src/main/doc/dictionary.txt                   |  104 ++
 spec/src/main/doc/docbook45.conf                   |   97 ++
 spec/src/main/doc/events.asciidoc                  |  447 +++++++
 spec/src/main/doc/generate.sh                      |   46 +
 spec/src/main/doc/html5.conf                       |   41 +
 spec/src/main/doc/implementation.asciidoc          |  965 +++++++++++++++
 spec/src/main/doc/inheritance.asciidoc             |  208 ++++
 spec/src/main/doc/injectionelresolution.asciidoc   |  721 +++++++++++
 spec/src/main/doc/interceptors.asciidoc            |  104 ++
 spec/src/main/doc/license-asl2.asciidoc            |   28 +
 spec/src/main/doc/license-jcp.asciidoc             |   63 +
 spec/src/main/doc/lifecycle.asciidoc               |  186 +++
 spec/src/main/doc/packagingdeployment.asciidoc     |  220 ++++
 spec/src/main/doc/preface.asciidoc                 |   37 +
 spec/src/main/doc/scopescontexts.asciidoc          |  585 +++++++++
 spec/src/main/doc/spi.asciidoc                     | 1284 ++++++++++++++++++++
 145 files changed, 8025 insertions(+), 229 deletions(-)

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



More information about the pkg-java-commits mailing list