Clone
Matthieu Clochard <clochard.matthieu@gmail.com>
committed
on 24 Aug 11
Add Weld-OSGi examples files and bundles
Conflicts:
environments/osgi/build/pom.xml
environments/osgi/core/api/pom.xml
environments/osgi/… Show more
Add Weld-OSGi examples files and bundles

Conflicts:

        environments/osgi/build/pom.xml

        environments/osgi/core/api/pom.xml

        environments/osgi/core/extension/pom.xml

        environments/osgi/core/integration/pom.xml

        environments/osgi/core/mandatory/pom.xml

        environments/osgi/core/pom.xml

        environments/osgi/core/spi/pom.xml

        environments/osgi/docs/design/pom.xml

        environments/osgi/docs/pom.xml

        environments/osgi/docs/user/pom.xml

        environments/osgi/tests/bundles/bundle1/pom.xml

        environments/osgi/tests/bundles/bundle2/pom.xml

        environments/osgi/tests/bundles/bundle3/pom.xml

        environments/osgi/tests/bundles/cdi-spi/pom.xml

        environments/osgi/tests/bundles/importing-bundle/pom.xml

        environments/osgi/tests/bundles/scanner-inner/pom.xml

        environments/osgi/tests/bundles/scanner/pom.xml

        environments/osgi/tests/pom.xml

        environments/osgi/tests/tester/pom.xml

Show less