[atinject-jsr330] 04/06: Merge tag 'upstream/1.0+ds1'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository atinject-jsr330.

commit f657f0edbce2018e3f081bf9c8bc7dc1c7d56f69
Merge: 35d4331 346a2a6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 17 16:32:55 2013 +0200

    Merge tag 'upstream/1.0+ds1'
    
    Upstream version 1.0+ds1

 build.sh                                           |   59 ++
 pom.xml                                            |  122 +++++
 {javax => src/javax}/inject/Inject.java            |    0
 {javax => src/javax}/inject/Named.java             |    0
 {javax => src/javax}/inject/Provider.java          |    0
 {javax => src/javax}/inject/Qualifier.java         |    0
 {javax => src/javax}/inject/Scope.java             |    0
 {javax => src/javax}/inject/Singleton.java         |    0
 {javax => src/javax}/inject/package-info.java      |    4 +-
 tck-pom.xml                                        |  122 +++++
 tck/org/atinject/tck/Tck.java                      |  128 +++++
 .../org/atinject/tck/auto/Car.java                 |   16 +-
 tck/org/atinject/tck/auto/Convertible.java         |  573 ++++++++++++++++++++
 .../org/atinject/tck/auto/Drivers.java             |   18 +-
 .../org/atinject/tck/auto/DriversSeat.java         |   24 +-
 tck/org/atinject/tck/auto/Engine.java              |   68 +++
 .../org/atinject/tck/auto/FuelTank.java            |   16 +-
 .../org/atinject/tck/auto/GasEngine.java           |   25 +-
 .../org/atinject/tck/auto/Seat.java                |   32 +-
 .../org/atinject/tck/auto/Seatbelt.java            |   17 +-
 tck/org/atinject/tck/auto/Tire.java                |  182 +++++++
 tck/org/atinject/tck/auto/V8Engine.java            |   61 +++
 .../atinject/tck/auto/accessories/Cupholder.java   |   29 +-
 .../atinject/tck/auto/accessories/RoundThing.java  |   42 +-
 .../atinject/tck/auto/accessories/SpareTire.java   |  122 +++++
 tck/org/atinject/tck/package-info.java             |    8 +
 26 files changed, 1540 insertions(+), 128 deletions(-)

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