You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/09/29 15:10:22 UTC

[karaf-winegrower] branch master updated (c01b970 -> 921ed1a)

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

jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-winegrower.git.


    from c01b970  Merge pull request #9 from rmannibucau/rmannibucau/ensure-pour-defaults-match-config-defaults
     new ff81cc4  Ensure OSGi CDI works
     new 2029f05  fix jaxrs cepage artifactid
     new cb025c3  support Bundle.Adapt(ServiceReferenceDTO[])
     new e41eb3c  adding org.apache.felix.http.jetty priority by default
     new df23e8f  avoid locks when registering services, upgrading gh action to java 11.0.6 and disabling some spifly logs implicitly
     new 981ac94  better synchronization for serviceListeners
     new 4817ca4  fix example after jaxrs renaming
     new 2f75a37  better respect of serviceref#unget
     new 3bec118  precise asm exclusion
     new 921ed1a  Merge pull request #10 from rmannibucau/rmannibucau/ensure-osgi-cdi-works

The 218 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.


Summary of changes:
 .github/workflows/maven.yml                        |   4 +-
 pom.xml                                            |   8 +-
 winegrower-cepages/winegrower-cepage-jaxrs/pom.xml |   2 +-
 .../winegrower-cepage-osgi-cdi/pom.xml             |   3 +-
 .../manifest/OSGiCDIManifestContributor.java       |  91 --------
 .../META-INF/openwebbeans/openwebbeans.properties  |  12 +-
 ...winegrower.scanner.manifest.ManifestContributor |   1 -
 .../winegrower/cepage/osgicdi/OSGiCDITest.java     |  59 -----
 winegrower-core/pom.xml                            |   7 +
 .../main/java/org/apache/winegrower/Ripener.java   | 139 +++++++-----
 .../winegrower/deployer/BundleContextImpl.java     |   2 +-
 .../org/apache/winegrower/deployer/BundleImpl.java |  74 +++++--
 .../winegrower/deployer/BundleWiringImpl.java      |   1 +
 .../winegrower/deployer/ServiceObjectsImpl.java    |   2 +-
 .../manifest/HeaderManifestContributor.java        |  22 +-
 .../manifest/OSGiCDIManifestContributor.java       | 168 +++++++++++++++
 .../manifest/RequirementManifestContributor.java   | 147 +++++++++++++
 .../apache/winegrower/service/OSGiServices.java    |  20 +-
 .../winegrower/service/ServiceReferenceImpl.java   |   7 +-
 .../winegrower/service/Slf4jOSGiLoggerFactory.java | 240 +++++++++++++++++++++
 .../java/org/apache/winegrower/RipenerTest.java    |  12 +-
 .../manifest/OSGiCDIManifestContributorTest.java   |  76 +++++++
 .../RequirementManifestContributorTest.java        |  43 ++++
 .../manifest/cdi/AriesPluralRequirement.java}      |  12 +-
 .../manifest/cdi/AriesSingularRequirement.java     |  11 +-
 .../scanner/manifest/cdi/StandardRequirement.java  |  14 +-
 .../org/apache/winegrower/test/WithRipener.java    |   2 +-
 winegrower-examples/jaxrs-whiteboard/pom.xml       |   2 +-
 winegrower-examples/osgi-cdi/pom.xml               |   7 -
 .../src/main}/resources/META-INF/beans.xml         |  11 +-
 winegrower-extension/winegrower-agent/pom.xml      |   2 +-
 .../winegrower-build-common/pom.xml                |   8 +-
 .../winegrower/extension/build/maven/PourMojo.java |  88 +++++---
 33 files changed, 964 insertions(+), 333 deletions(-)
 delete mode 100644 winegrower-cepages/winegrower-cepage-osgi-cdi/src/main/java/org/apache/winegrower/scanner/manifest/OSGiCDIManifestContributor.java
 copy winegrower-extension/winegrower-build/winegrower-build-common/src/test/resources/build/bin/setenv.sh => winegrower-cepages/winegrower-cepage-osgi-cdi/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (63%)
 delete mode 100644 winegrower-cepages/winegrower-cepage-osgi-cdi/src/main/resources/META-INF/services/org.apache.winegrower.scanner.manifest.ManifestContributor
 delete mode 100644 winegrower-cepages/winegrower-cepage-osgi-cdi/src/test/java/org/apache/winegrower/cepage/osgicdi/OSGiCDITest.java
 create mode 100644 winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/OSGiCDIManifestContributor.java
 create mode 100644 winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/RequirementManifestContributor.java
 create mode 100644 winegrower-core/src/main/java/org/apache/winegrower/service/Slf4jOSGiLoggerFactory.java
 create mode 100644 winegrower-core/src/test/java/org/apache/winegrower/scanner/manifest/OSGiCDIManifestContributorTest.java
 create mode 100644 winegrower-core/src/test/java/org/apache/winegrower/scanner/manifest/RequirementManifestContributorTest.java
 copy winegrower-core/src/test/java/org/apache/winegrower/{test/simpleservice/MyService.java => scanner/manifest/cdi/AriesPluralRequirement.java} (63%)
 copy winegrower-examples/bundle/src/main/java/org/apache/winegrower/examples/EchoService.java => winegrower-core/src/test/java/org/apache/winegrower/scanner/manifest/cdi/AriesSingularRequirement.java (75%)
 copy winegrower-examples/bundle/src/main/java/org/apache/winegrower/examples/EchoService.java => winegrower-core/src/test/java/org/apache/winegrower/scanner/manifest/cdi/StandardRequirement.java (71%)
 rename {winegrower-cepages/winegrower-cepage-osgi-cdi/src/test => winegrower-examples/osgi-cdi/src/main}/resources/META-INF/beans.xml (69%)