This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2177-detach-util-from-aries-application in repository https://gitbox.apache.org/repos/asf/aries.git
commit 4948685062c08a468bd04316dbf6816d05f38f21 Author: Dominik Przybysz <[email protected]> AuthorDate: Sun Apr 20 23:15:39 2025 +0200 ARIES-2177: Detach aries.util from aries.application --- .../main/java/org/apache/aries/util/VersionRange.java | 5 ----- .../aries/util/manifest/ManifestHeaderProcessor.java | 17 +++++++++++------ util/src/test/resources/META-INF/APPLICATION2.MF | 13 ------------- util/src/test/resources/META-INF/APPLICATION3.MF | 3 --- util/src/test/resources/META-INF/APPLICATION4.MF | 10 ---------- util/src/test/resources/zip/META-INF/APPLICATION2.MF | 13 ------------- util/src/test/resources/zip/META-INF/APPLICATION3.MF | 3 --- util/src/test/resources/zip/META-INF/APPLICATION4.MF | 10 ---------- 8 files changed, 11 insertions(+), 63 deletions(-) diff --git a/util/src/main/java/org/apache/aries/util/VersionRange.java b/util/src/main/java/org/apache/aries/util/VersionRange.java index ea9a973ab..f5b003bd0 100644 --- a/util/src/main/java/org/apache/aries/util/VersionRange.java +++ b/util/src/main/java/org/apache/aries/util/VersionRange.java @@ -98,11 +98,6 @@ public final class VersionRange { assertInvariants(); } - /* - * (non-Javadoc) - * - * @see org.apache.aries.application.impl.VersionRange#toString() - */ @Override public String toString() { // Some constructors don't take in a string that we can return directly, diff --git a/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java b/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java index 55a2c1de1..f648ff084 100644 --- a/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java +++ b/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java @@ -19,6 +19,11 @@ package org.apache.aries.util.manifest; +import org.apache.aries.util.ManifestHeaderUtils; +import org.apache.aries.util.VersionRange; +import org.osgi.framework.Constants; +import org.osgi.framework.Version; + import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -28,15 +33,15 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.aries.util.ManifestHeaderUtils; -import org.apache.aries.util.VersionRange; -import org.osgi.framework.Constants; -import org.osgi.framework.Version; - public class ManifestHeaderProcessor { + /** + * @deprecated use {@link #NESTED_FILTER_ATTRIBUTE_TO_USE_WITHOUT_FORMATTING} + */ + @Deprecated public static final String NESTED_FILTER_ATTRIBUTE = "org.apache.aries.application.filter.attribute"; + public static final String NESTED_FILTER_ATTRIBUTE_TO_USE_WITHOUT_FORMATTING = "org.apache.aries.manifestheaderprocessor.filter.attribute"; private static final Pattern FILTER_ATTR = Pattern.compile("(\\(!)?\\((.*?)([<>]?=)(.*?)\\)\\)?"); private static final String LESS_EQ_OP = "<="; private static final String GREATER_EQ_OP = ">="; @@ -564,7 +569,7 @@ public class ManifestHeaderProcessor } filter.append(")"); - } else if (NESTED_FILTER_ATTRIBUTE.equals(attribName)) { + } else if (NESTED_FILTER_ATTRIBUTE.equals(attribName) || NESTED_FILTER_ATTRIBUTE_TO_USE_WITHOUT_FORMATTING.equals(attribName)) { // Filters go in whole, no formatting needed realAttrib = true; filter.append(attrib.getValue()); diff --git a/util/src/test/resources/META-INF/APPLICATION2.MF b/util/src/test/resources/META-INF/APPLICATION2.MF deleted file mode 100644 index 412296335..000000000 --- a/util/src/test/resources/META-INF/APPLICATION2.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Application-ManifestVersion: 1.0 -Application-Name: Travel Reservation -Application-SymbolicName: com.travel.reservation -Application-Version: 1.2 -Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)", - com.travel.reservation.business, -Export-Package: com.travel.reservation.api;version=1.2 -Import-Package: com.travel.flight.api;version="[2.1.1,3.0.0)", - com.travel.rail.api;version="[1.0.0,2.0.0)", - com.travel.credit.api;version="[2.1.0,2.1.0]", - com.travel.hotel.api;version="[1.5.0,2.0.0)" -Application-Services: services.xml diff --git a/util/src/test/resources/META-INF/APPLICATION3.MF b/util/src/test/resources/META-INF/APPLICATION3.MF deleted file mode 100644 index c49a653f9..000000000 --- a/util/src/test/resources/META-INF/APPLICATION3.MF +++ /dev/null @@ -1,3 +0,0 @@ -Application-SymbolicName: org.apache.aries.applications.test.app -Application-Version: 1.4.0 -Application-Content: org.apache.aries.applications.test.bundle diff --git a/util/src/test/resources/META-INF/APPLICATION4.MF b/util/src/test/resources/META-INF/APPLICATION4.MF deleted file mode 100644 index acee04d02..000000000 --- a/util/src/test/resources/META-INF/APPLICATION4.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Application-ManifestVersion: 1.0 -Application-Name: Travel Reservation -Application-SymbolicName: com.travel.reservation -Application-Version: 1.2 -Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)", - com.travel.reservation.business -Use-Bundle: com.travel.reservation.api;version="[1.0.0,2.0.0)" -Application-ImportService: com.travel.flight.api,com.travel.rail.api -Application-ExportService: com.travel.reservation diff --git a/util/src/test/resources/zip/META-INF/APPLICATION2.MF b/util/src/test/resources/zip/META-INF/APPLICATION2.MF deleted file mode 100644 index 412296335..000000000 --- a/util/src/test/resources/zip/META-INF/APPLICATION2.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Application-ManifestVersion: 1.0 -Application-Name: Travel Reservation -Application-SymbolicName: com.travel.reservation -Application-Version: 1.2 -Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)", - com.travel.reservation.business, -Export-Package: com.travel.reservation.api;version=1.2 -Import-Package: com.travel.flight.api;version="[2.1.1,3.0.0)", - com.travel.rail.api;version="[1.0.0,2.0.0)", - com.travel.credit.api;version="[2.1.0,2.1.0]", - com.travel.hotel.api;version="[1.5.0,2.0.0)" -Application-Services: services.xml diff --git a/util/src/test/resources/zip/META-INF/APPLICATION3.MF b/util/src/test/resources/zip/META-INF/APPLICATION3.MF deleted file mode 100644 index c49a653f9..000000000 --- a/util/src/test/resources/zip/META-INF/APPLICATION3.MF +++ /dev/null @@ -1,3 +0,0 @@ -Application-SymbolicName: org.apache.aries.applications.test.app -Application-Version: 1.4.0 -Application-Content: org.apache.aries.applications.test.bundle diff --git a/util/src/test/resources/zip/META-INF/APPLICATION4.MF b/util/src/test/resources/zip/META-INF/APPLICATION4.MF deleted file mode 100644 index acee04d02..000000000 --- a/util/src/test/resources/zip/META-INF/APPLICATION4.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Application-ManifestVersion: 1.0 -Application-Name: Travel Reservation -Application-SymbolicName: com.travel.reservation -Application-Version: 1.2 -Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)", - com.travel.reservation.business -Use-Bundle: com.travel.reservation.api;version="[1.0.0,2.0.0)" -Application-ImportService: com.travel.flight.api,com.travel.rail.api -Application-ExportService: com.travel.reservation
