This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/org.osgi-osgi.core-8.0.0
in repository https://gitbox.apache.org/repos/asf/aries.git
omit 8da88cfbb Bump org.osgi:osgi.core from 4.3.1 to 8.0.0
add 035aff144 ARIES-2177: Merge application.utils to application modeller
add 74f560de7 Bump org.osgi:osgi.core from 4.3.1 to 8.0.0
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 (8da88cfbb)
\
N -- N -- N refs/heads/dependabot/maven/org.osgi-osgi.core-8.0.0
(74f560de7)
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.
No new revisions were added by this update.
Summary of changes:
application/application-modeller/pom.xml | 13 +-
.../impl/ApplicationMetadataFactoryImpl.java | 0
.../application/impl/ApplicationMetadataImpl.java | 0
.../apache/aries/application/impl/ContentImpl.java | 73 +++---
.../application/impl/DeploymentContentImpl.java | 0
.../impl/DeploymentMetadataFactoryImpl.java | 0
.../application/impl/DeploymentMetadataImpl.java | 0
.../application/impl/ServiceDeclarationImpl.java | 0
.../modelling/impl/AbstractParserProxy.java | 31 +--
.../modelling/impl/DeployedBundlesImpl.java | 55 ++--
.../modelling/impl/ExportedBundleImpl.java | 27 +-
.../modelling/impl/ExportedPackageImpl.java | 30 +--
.../modelling/impl/ExportedServiceImpl.java | 53 ++--
.../modelling/impl/ImportedBundleImpl.java | 53 ++--
.../modelling/impl/ImportedPackageImpl.java | 46 ++--
.../modelling/impl/ImportedServiceImpl.java | 62 +++--
.../modelling/impl/ModelledResourceImpl.java | 66 +++--
.../impl/ModelledResourceManagerImpl.java | 21 +-
.../modelling/impl/ParsedServiceElementsImpl.java | 15 +-
.../modelling/internal/BundleBlueprintParser.java | 6 +-
.../internal/PackageRequirementMerger.java | 22 +-
.../modelling/utils/impl/ModellingHelperImpl.java | 18 +-
.../aries/application/utils/AppConstants.java | 7 +-
.../application/utils}/ExportedServiceHelper.java | 2 +-
.../aries/application/utils/FilterUtils.java | 7 +-
.../resources/OSGI-INF/blueprint/app-utils.xml | 0
.../impl/ApplicationMetadataImplTest.java | 1 -
.../impl/DeploymentContentImplTest.java | 0
.../src/test/resources/META-INF/APPLICATION.MF | 0
.../src/test/resources/META-INF/APPLICATION2.MF | 0
.../src/test/resources/META-INF/APPLICATION3.MF | 0
.../src/test/resources/META-INF/APPLICATION4.MF | 0
.../src/test/resources/META-INF/DEPLOYMENT.MF | 0
application/application-utils/LICENSE | 203 ---------------
application/application-utils/NOTICE | 8 -
application/application-utils/pom.xml | 131 ----------
.../utils/ServiceDeclarationFactory.java | 32 ---
.../application/utils/internal/MessageUtil.java | 46 ----
.../utils/management/SimpleBundleInfo.java | 168 ------------
.../aries/application/utils/management/packageinfo | 19 --
.../application/utils/manifest/ContentFactory.java | 48 ----
.../utils/manifest/ManifestDefaultsInjector.java | 283 ---------------------
.../aries/application/utils/manifest/packageinfo | 19 --
.../org/apache/aries/application/utils/packageinfo | 19 --
.../aries/application/utils/runtime/packageinfo | 19 --
.../utils/service/ArrayServiceList.java | 241 ------------------
.../utils/service/ServiceCollection.java | 26 --
.../aries/application/utils/service/packageinfo | 19 --
.../utils/messages/APPUTILSmessages.properties | 21 --
.../utils/manifest/ManifestProcessorTest.java | 153 -----------
.../test/resources/app1/META-INF/APPLICATION.MF | 16 --
.../src/test/resources/app1/META-INF/DEPLOYMENT.MF | 6 -
.../bundles/exploded.jar/META-INF/MANIFEST.MF | 2 -
.../exploded.jar/META-INF/beforeManifest.file | 19 --
.../src/test/resources/zip/file.txt | 19 --
.../src/test/resources/zip/subdir/someFile.txt | 19 --
application/pom.xml | 1 -
subsystem/readme.txt | 1 -
subsystem/subsystem-bundle/pom.xml | 6 -
subsystem/subsystem-core/pom.xml | 6 -
subsystem/subsystem-itests/pom.xml | 17 --
.../aries/subsystem/itests/SubsystemTest.java | 1 -
.../aries/subsystem/itests/util/ContentImpl.java | 5 -
subsystem/subsystem-obr/pom.xml | 6 -
.../obr/internal/RepositoryAdminRepository.java | 7 +-
.../util/felix/OsgiRequirementAdapter.java | 7 +-
66 files changed, 283 insertions(+), 1918 deletions(-)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/impl/ApplicationMetadataFactoryImpl.java
(100%)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java
(100%)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/impl/ContentImpl.java
(93%)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/impl/DeploymentContentImpl.java
(100%)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
(100%)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
(100%)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/impl/ServiceDeclarationImpl.java
(100%)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/utils/AppConstants.java
(95%)
rename
application/{application-utils/src/main/java/org/apache/aries/application/utils/service
=>
application-modeller/src/main/java/org/apache/aries/application/utils}/ExportedServiceHelper.java
(95%)
rename application/{application-utils =>
application-modeller}/src/main/java/org/apache/aries/application/utils/FilterUtils.java
(87%)
rename application/{application-utils =>
application-modeller}/src/main/resources/OSGI-INF/blueprint/app-utils.xml (100%)
rename application/{application-utils =>
application-modeller}/src/test/java/org/apache/aries/application/impl/ApplicationMetadataImplTest.java
(97%)
rename application/{application-utils =>
application-modeller}/src/test/java/org/apache/aries/application/impl/DeploymentContentImplTest.java
(100%)
rename application/{application-utils =>
application-modeller}/src/test/resources/META-INF/APPLICATION.MF (100%)
rename application/{application-utils =>
application-modeller}/src/test/resources/META-INF/APPLICATION2.MF (100%)
rename application/{application-utils =>
application-modeller}/src/test/resources/META-INF/APPLICATION3.MF (100%)
rename application/{application-utils =>
application-modeller}/src/test/resources/META-INF/APPLICATION4.MF (100%)
rename application/{application-utils =>
application-modeller}/src/test/resources/META-INF/DEPLOYMENT.MF (100%)
delete mode 100644 application/application-utils/LICENSE
delete mode 100644 application/application-utils/NOTICE
delete mode 100644 application/application-utils/pom.xml
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/ServiceDeclarationFactory.java
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/internal/MessageUtil.java
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/management/packageinfo
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ContentFactory.java
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestDefaultsInjector.java
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/packageinfo
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/packageinfo
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/packageinfo
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/service/ArrayServiceList.java
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/service/ServiceCollection.java
delete mode 100644
application/application-utils/src/main/java/org/apache/aries/application/utils/service/packageinfo
delete mode 100644
application/application-utils/src/main/resources/org/apache/aries/application/utils/messages/APPUTILSmessages.properties
delete mode 100644
application/application-utils/src/test/java/org/apache/aries/application/utils/manifest/ManifestProcessorTest.java
delete mode 100644
application/application-utils/src/test/resources/app1/META-INF/APPLICATION.MF
delete mode 100644
application/application-utils/src/test/resources/app1/META-INF/DEPLOYMENT.MF
delete mode 100644
application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF
delete mode 100644
application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file
delete mode 100644
application/application-utils/src/test/resources/zip/file.txt
delete mode 100644
application/application-utils/src/test/resources/zip/subdir/someFile.txt
