karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject [karaf] branch KARAF-5376-overrides_v2 updated (6c80376 -> 3bc2764)
Date Wed, 15 Nov 2017 15:28:57 GMT
This is an automated email from the ASF dual-hosted git repository.

ggrzybek pushed a change to branch KARAF-5376-overrides_v2
in repository https://gitbox.apache.org/repos/asf/karaf.git.


 discard 6c80376  [KARAF-5376] Include new Features JAXB model info in feature:* commands
 discard 0f6059b  [KARAF-5376] Moving overrides and blacklist mechanisms to "features processor"
service
     add c9bffd9  [KARAF-5467]Karaf doesn't recognize Java 9 on Ubuntu 16.04
     add 94cd1e0  [KARAF-5467]more fix
     add d4ed5e5  localRepositoryPath works now for maven-invoker-plugin tests (real local
repository as remote in it/
     add 4cd28b2  [KARAF-5470] Extend enforce JDK version range to include Java 9
     add a06a34c  Remove unnecessary code
     add 36b6a46  Merge pull request #393 from tadayosi/master
     add e424722  Do not attempt to start already starting bundles
     add 7ec85f0  Remove unused option
     add 634ba15  When removing a features repository, handle the fact that another repo can
provide the required feature
     add 631e9b0  Deduplicate the java process management code in karaf
     add e21ba2b  [KARAF-5476] Reduce number of logins when using the webconsole
     new 8057710  [KARAF-5376] Moving overrides and blacklist mechanisms to "features processor"
service
     new e91f6d1  [KARAF-5376] Include new Features JAXB model info in feature:* commands
     new 9fca11c  [KARAF-5376] Review BuilderTest
     new f2650df  Revert "[KARAF-5416] Remove support for ext and endorsed libraries for Java
9 compatibility"
     new 56edacd  [KARAF-5478] Provide org.apache.karaf.util.Version class
     new 48770ab  [KARAF-5376] Polish LocationPattern and FeaturePattern helpers for blacklist/override
matching
     new 3bc2764  [KARAF-5468] Cleaning up AssemblyMojo, Profiles and profile Builder

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6c80376)
            \
             N -- N -- N   refs/heads/KARAF-5376-overrides_v2 (3bc2764)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 7 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:
 assemblies/features/base/pom.xml                   |  10 +
 .../src/main/filtered-resources/resources/bin/inc  |  12 +-
 .../main/filtered-resources/resources/bin/karaf    |   6 +
 .../filtered-resources/resources/bin/karaf.bat     |   2 +
 .../src/main/resources/resources/lib/boot/README   |   9 +-
 .../resources/lib/{ext => endorsed}/README         |   8 +-
 assemblies/features/framework/pom.xml              |   5 +
 demos/profiles/dynamic/pom.xml                     |   6 +-
 demos/profiles/static/pom.xml                      |   6 +-
 {wrapper => exception}/NOTICE                      |   0
 {jpa => exception}/pom.xml                         |  15 +-
 exception/src/main/java/java/lang/Exception.java   | 194 ++++++
 .../org/apache/karaf/features/FeaturePattern.java  | 108 ++++
 .../{internal/service => }/LocationPattern.java    |  23 +-
 .../model/processing/BundleReplacements.java       |   4 +-
 .../model/processing/FeaturesProcessing.java       |   5 +-
 .../karaf/features/internal/service/Blacklist.java | 176 ++----
 .../karaf/features/internal/service/Deployer.java  |   3 +-
 .../internal/service/FeaturesProcessorImpl.java    |  17 +-
 .../internal/service/FeaturesServiceImpl.java      |  35 +-
 .../features/karaf-features-processing-1.0.0.xsd   |   2 +-
 .../internal/service/FeaturePatternTest.java       |  73 +++
 .../internal/service/LocationPatternTest.java      |   1 +
 .../main/java/org/apache/karaf/jpm/Process.java    |  47 --
 .../java/org/apache/karaf/jpm/ProcessBuilder.java  |  60 --
 .../apache/karaf/jpm/ProcessBuilderFactory.java    |  25 -
 .../karaf/jpm/impl/ProcessBuilderFactoryImpl.java  |  27 -
 .../apache/karaf/jpm/impl/ProcessBuilderImpl.java  |  48 --
 .../org/apache/karaf/jpm/impl/ProcessImpl.java     | 149 -----
 .../org/apache/karaf/jpm/impl/ScriptUtils.java     | 123 ----
 .../karaf/management/KarafMBeanServerGuard.java    |   1 -
 .../main/asciidoc/user-guide/os-integration.adoc   |   2 +
 pom.xml                                            |   8 +-
 profile/pom.xml                                    |   3 +-
 .../java/org/apache/karaf/profile/Profile.java     | 129 ++--
 .../org/apache/karaf/profile/ProfileConstants.java | 128 ++++
 .../org/apache/karaf/profile/assembly/Builder.java | 608 ++++++++++++++----
 .../karaf/profile/command/ProfileCreate.java       |   2 -
 .../karaf/profile/command/ProfileDisplay.java      |  14 +-
 .../apache/karaf/profile/command/ProfileEdit.java  |  28 +-
 .../karaf/profile/impl/ProfileBuilderImpl.java     |  28 +-
 .../org/apache/karaf/profile/impl/ProfileImpl.java |  72 ++-
 .../org/apache/karaf/profile/impl/Profiles.java    |  99 ++-
 .../apache/karaf/profile/assembly/BuilderTest.java |  28 +
 .../apache/karaf/profile/impl/ProfilesTest.java    | 142 +++++
 .../src/test/resources/log4j.properties            |  13 +-
 tooling/karaf-maven-plugin/pom.xml                 |  20 +-
 .../org/apache/karaf/tooling/AssemblyMojo.java     | 678 +++++++++++++--------
 .../java/org/apache/karaf/tooling/VerifyMojo.java  |  28 +-
 .../org/apache/karaf/tooling/utils/MavenUtil.java  |  32 +-
 .../src/test/filtered-resources/settings.xml       |  35 +-
 util/pom.xml                                       |   9 +
 .../org/apache/karaf/util}/versions.properties     |   0
 .../main/java/org/apache/karaf/jpm/Process.java    |   0
 .../java/org/apache/karaf/jpm/ProcessBuilder.java  |   0
 .../apache/karaf/jpm/ProcessBuilderFactory.java    |   0
 .../karaf/jpm/impl/ProcessBuilderFactoryImpl.java  |   0
 .../apache/karaf/jpm/impl/ProcessBuilderImpl.java  |   0
 .../org/apache/karaf/jpm/impl/ProcessImpl.java     |   0
 .../org/apache/karaf/jpm/impl/ScriptUtils.java     |   0
 .../main/java/org/apache/karaf/util/Version.java   |  25 +-
 .../org/apache/karaf/jpm/impl/unix/start.sh        |   0
 .../org/apache/karaf/jpm/impl/windows/destroy.vbs  |   0
 .../org/apache/karaf/jpm/impl/windows/running.vbs  |   0
 .../org/apache/karaf/jpm/impl/windows/start.vbs    |   0
 .../internal/servlet/JaasSecurityProvider.java     |  36 +-
 .../karaf/wrapper/internal/unix/karaf-wrapper.conf |   4 +-
 .../wrapper/internal/windows/karaf-wrapper.conf    |   4 +-
 .../wrapper/internal/windows64/karaf-wrapper.conf  |   4 +-
 69 files changed, 2173 insertions(+), 1206 deletions(-)
 copy archetypes/command/src/test/resources/projects/command/archetype.properties => assemblies/features/base/src/main/resources/resources/lib/boot/README
(86%)
 copy assemblies/features/base/src/main/resources/resources/lib/{ext => endorsed}/README
(81%)
 copy {wrapper => exception}/NOTICE (100%)
 copy {jpa => exception}/pom.xml (85%)
 create mode 100644 exception/src/main/java/java/lang/Exception.java
 create mode 100644 features/core/src/main/java/org/apache/karaf/features/FeaturePattern.java
 rename features/core/src/main/java/org/apache/karaf/features/{internal/service => }/LocationPattern.java
(94%)
 create mode 100644 features/core/src/test/java/org/apache/karaf/features/internal/service/FeaturePatternTest.java
 delete mode 100644 instance/src/main/java/org/apache/karaf/jpm/Process.java
 delete mode 100644 instance/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
 delete mode 100644 instance/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
 delete mode 100644 instance/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
 delete mode 100644 main/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java
 delete mode 100644 main/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
 delete mode 100644 main/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java
 create mode 100644 profile/src/main/java/org/apache/karaf/profile/ProfileConstants.java
 copy {itests => profile}/src/test/resources/log4j.properties (70%)
 copy itests/src/test/resources/etc/maven-settings.xml => tooling/karaf-maven-plugin/src/test/filtered-resources/settings.xml
(58%)
 rename {tooling/karaf-maven-plugin/src/main/filtered-resources/org/apache/karaf/tooling =>
util/src/main/filtered-resources/org/apache/karaf/util}/versions.properties (100%)
 rename {main => util}/src/main/java/org/apache/karaf/jpm/Process.java (100%)
 rename {main => util}/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java (100%)
 rename {main => util}/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java (100%)
 rename {main => util}/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
(100%)
 rename {instance => util}/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java
(100%)
 rename {instance => util}/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java (100%)
 rename {instance => util}/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java (100%)
 copy shell/core/src/test/java/org/apache/karaf/shell/support/ansi/AnsiSplitterTest.java =>
util/src/main/java/org/apache/karaf/util/Version.java (60%)
 rename {instance => util}/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh (100%)
 rename {instance => util}/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs
(100%)
 rename {instance => util}/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs
(100%)
 rename {instance => util}/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs
(100%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <commits@karaf.apache.org>'].

Mime
View raw message