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 2018/05/07 19:55:08 UTC

[karaf] branch master updated (ace2d61 -> c407fae)

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.git.


    from ace2d61  [KARAF-5739] Use plugin management version in manual for maven-bundle-plugin
     add c9d89b1  [KARAF-5706] Upgrade to Felix Utils 1.11.0
     new c407fae  Merge pull request #490 from gnodet/KARAF-5706

The 1 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:
 features/core/pom.xml                              |    3 +
 .../karaf/features/internal/osgi/Activator.java    |    2 +-
 .../features/internal/region/OfflineResolver.java  |   10 +-
 .../internal/region/RepositoryManager.java         |    2 +-
 .../karaf/features/internal/region/Subsystem.java  |   14 +-
 .../internal/region/SubsystemResolveContext.java   |    8 +-
 .../internal/region/SubsystemResolver.java         |   35 +-
 .../internal/repository/AggregateRepository.java   |   55 -
 .../internal/repository/BaseRepository.java        |   91 --
 .../internal/repository/JsonRepository.java        |   86 +-
 .../features/internal/repository/StaxParser.java   |  451 --------
 .../features/internal/repository/UrlLoader.java    |  126 --
 .../internal/repository/XmlRepository.java         |  154 +--
 .../features/internal/resolver/BaseClause.java     |  114 --
 .../features/internal/resolver/CapabilityImpl.java |   84 --
 .../features/internal/resolver/CapabilitySet.java  |  464 --------
 .../internal/resolver/FeatureResource.java         |    2 +
 .../internal/resolver/RequirementImpl.java         |   82 --
 .../internal/resolver/ResourceBuilder.java         | 1209 --------------------
 .../features/internal/resolver/ResourceImpl.java   |  116 --
 .../features/internal/resolver/ResourceUtils.java  |    6 +-
 .../features/internal/resolver/SimpleFilter.java   |  585 ----------
 .../features/internal/service/RequirementSort.java |    4 +-
 .../features/internal/util/StringArrayMap.java     |  329 ------
 .../internal/repository/RepositoryTest.java        |    1 +
 .../features/internal/service/OverridesTest.java   |    2 +-
 .../features/internal/support/TestBundle.java      |    4 +-
 pom.xml                                            |    2 +-
 profile/pom.xml                                    |    4 +
 .../org/apache/karaf/profile/assembly/Builder.java |    5 +-
 .../karaf/profile/assembly/FakeBundleRevision.java |    4 +-
 .../java/org/apache/karaf/tooling/VerifyMojo.java  |    4 +-
 32 files changed, 81 insertions(+), 3977 deletions(-)
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/repository/AggregateRepository.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/repository/BaseRepository.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/repository/StaxParser.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/resolver/BaseClause.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/resolver/CapabilityImpl.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/resolver/CapabilitySet.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/resolver/RequirementImpl.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceImpl.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/resolver/SimpleFilter.java
 delete mode 100644 features/core/src/main/java/org/apache/karaf/features/internal/util/StringArrayMap.java

-- 
To stop receiving notification emails like this one, please contact
jbonofre@apache.org.

[karaf] 01/01: Merge pull request #490 from gnodet/KARAF-5706

Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c407fae2977cd81d522aaeefe3180be6a06ffe14
Merge: ace2d61 c9d89b1
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon May 7 21:55:03 2018 +0200

    Merge pull request #490 from gnodet/KARAF-5706
    
    [KARAF-5706] Upgrade to Felix Utils 1.11.0

 features/core/pom.xml                              |    3 +
 .../karaf/features/internal/osgi/Activator.java    |    2 +-
 .../features/internal/region/OfflineResolver.java  |   10 +-
 .../internal/region/RepositoryManager.java         |    2 +-
 .../karaf/features/internal/region/Subsystem.java  |   14 +-
 .../internal/region/SubsystemResolveContext.java   |    8 +-
 .../internal/region/SubsystemResolver.java         |   35 +-
 .../internal/repository/AggregateRepository.java   |   55 -
 .../internal/repository/BaseRepository.java        |   91 --
 .../internal/repository/JsonRepository.java        |   86 +-
 .../features/internal/repository/StaxParser.java   |  451 --------
 .../features/internal/repository/UrlLoader.java    |  126 --
 .../internal/repository/XmlRepository.java         |  154 +--
 .../features/internal/resolver/BaseClause.java     |  114 --
 .../features/internal/resolver/CapabilityImpl.java |   84 --
 .../features/internal/resolver/CapabilitySet.java  |  464 --------
 .../internal/resolver/FeatureResource.java         |    2 +
 .../internal/resolver/RequirementImpl.java         |   82 --
 .../internal/resolver/ResourceBuilder.java         | 1209 --------------------
 .../features/internal/resolver/ResourceImpl.java   |  116 --
 .../features/internal/resolver/ResourceUtils.java  |    6 +-
 .../features/internal/resolver/SimpleFilter.java   |  585 ----------
 .../features/internal/service/RequirementSort.java |    4 +-
 .../features/internal/util/StringArrayMap.java     |  329 ------
 .../internal/repository/RepositoryTest.java        |    1 +
 .../features/internal/service/OverridesTest.java   |    2 +-
 .../features/internal/support/TestBundle.java      |    4 +-
 pom.xml                                            |    2 +-
 profile/pom.xml                                    |    4 +
 .../org/apache/karaf/profile/assembly/Builder.java |    5 +-
 .../karaf/profile/assembly/FakeBundleRevision.java |    4 +-
 .../java/org/apache/karaf/tooling/VerifyMojo.java  |    4 +-
 32 files changed, 81 insertions(+), 3977 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
jbonofre@apache.org.