New Upstream Release - osgi-annotation
Ready changes
Summary
Merged new upstream version: 8.1.0 (was: 8.0.1).
Resulting package
Built on 2022-05-16T11:53 (took 5m52s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases libosgi-annotation-java-docapt install -t fresh-releases libosgi-annotation-java
Lintian Result
Diff
diff --git a/debian/changelog b/debian/changelog
index e6d2ab9..268aefa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osgi-annotation (8.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Mon, 16 May 2022 11:47:22 -0000
+
osgi-annotation (8.0.1-1) unstable; urgency=medium
* New upstream version 8.0.1.
diff --git a/org/osgi/annotation/bundle/Export.java b/org/osgi/annotation/bundle/Export.java
index f70fc53..1d5a4d8 100644
--- a/org/osgi/annotation/bundle/Export.java
+++ b/org/osgi/annotation/bundle/Export.java
@@ -37,7 +37,7 @@ import org.osgi.annotation.versioning.Version;
* This annotation is not retained at runtime. It is for use by tools to
* generate bundle manifests or otherwise process the package.
*
- * @author $Id: 281871a62a21c8b789393ae591c3d8f3d424e5fd $
+ * @author $Id: 07e458dc13fd696af03961131a4fd91ac7c02774 $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
@@ -81,19 +81,21 @@ public @interface Export {
* If not specified, the {@link Substitution#CALCULATED} substitution
* policy is used for this package.
*/
- Substitution substitution() default Substitution.CALCULATED;
+ String substitution() default Substitution.CALCULATED;
/**
* Substitution policy for this package.
*/
- public enum Substitution {
+ public final class Substitution {
+ private Substitution() {
+ }
/**
* Use a consumer type version range for the import package clause when
* substitutably importing a package.
*
* @see ConsumerType
*/
- CONSUMER,
+ public static final String CONSUMER = "CONSUMER";
/**
* Use a provider type version range for the import package clause when
@@ -101,17 +103,17 @@ public @interface Export {
*
* @see ProviderType
*/
- PROVIDER,
+ public static final String PROVIDER = "PROVIDER";
/**
* The package must not be substitutably imported.
*/
- NOIMPORT,
+ public static final String NOIMPORT = "NOIMPORT";
/**
* The policy value is calculated by inspection of the classes in the
* package.
*/
- CALCULATED
+ public static final String CALCULATED = "CALCULATED";
}
}
diff --git a/org/osgi/annotation/bundle/Requirement.java b/org/osgi/annotation/bundle/Requirement.java
index d5fee9c..1b31824 100644
--- a/org/osgi/annotation/bundle/Requirement.java
+++ b/org/osgi/annotation/bundle/Requirement.java
@@ -40,7 +40,7 @@ import java.lang.annotation.Target;
* <p>
* This annotation can be used to annotate an annotation.
*
- * @author $Id: 5ce4279b29f0f3b383b4e538c6d1ba512aecbac8 $
+ * @author $Id: 8acf269bcf8de7a1b533c4ffcfb01856232b6c9f $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
@@ -119,32 +119,23 @@ public @interface Requirement {
* If not specified, the {@code cardinality} directive is omitted from the
* requirement clause.
*/
- Cardinality cardinality() default Cardinality.SINGLE;
+ String cardinality() default Cardinality.SINGLE;
/**
* Cardinality for this requirement.
*/
- public enum Cardinality {
+ public final class Cardinality {
+ private Cardinality() {
+ }
/**
* Indicates if the requirement can only be wired a single time.
*/
- SINGLE("single"), // Namespace.CARDINALITY_SINGLE
+ public static final String SINGLE = "SINGLE"; // Namespace.CARDINALITY_SINGLE
/**
* Indicates if the requirement can be wired multiple times.
*/
- MULTIPLE("multiple"); // Namespace.CARDINALITY_MULTIPLE
-
- private final String value;
-
- Cardinality(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return value;
- }
+ public static final String MULTIPLE = "MULTIPLE"; // Namespace.CARDINALITY_MULTIPLE
}
/**
@@ -157,33 +148,24 @@ public @interface Requirement {
* If not specified, the {@code resolution} directive is omitted from the
* requirement clause.
*/
- Resolution resolution() default Resolution.MANDATORY;
+ String resolution() default Resolution.MANDATORY;
/**
* Resolution for this requirement.
*/
- public enum Resolution {
+ public final class Resolution {
+ private Resolution() {
+ }
/**
* A mandatory requirement forbids the bundle to resolve when the
* requirement is not satisfied.
*/
- MANDATORY("mandatory"), // Namespace.RESOLUTION_MANDATORY
+ public static final String MANDATORY = "MANDATORY"; // Namespace.RESOLUTION_MANDATORY
/**
* An optional requirement allows a bundle to resolve even if the
* requirement is not satisfied.
*/
- OPTIONAL("optional"); // Namespace.RESOLUTION_OPTIONAL
-
- private final String value;
-
- Resolution(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return value;
- }
+ public static final String OPTIONAL = "OPTIONAL"; // Namespace.RESOLUTION_OPTIONAL
}
}
diff --git a/org/osgi/annotation/bundle/package-info.java b/org/osgi/annotation/bundle/package-info.java
index 53a3348..5c0792f 100644
--- a/org/osgi/annotation/bundle/package-info.java
+++ b/org/osgi/annotation/bundle/package-info.java
@@ -17,13 +17,13 @@
*******************************************************************************/
/**
- * OSGi Bundle Annotations Package Version 1.1.
+ * OSGi Bundle Annotations Package Version 2.0.
* <p>
* This package is not used at runtime.
*
- * @author $Id: 12d53d4428271bf289b774cef31987b288e3f884 $
+ * @author $Id: 5026b2f66e72c8250dd501fc7f3e673f6407a52b $
*/
-@Version("1.1.1")
+@Version("2.0")
package org.osgi.annotation.bundle;
import org.osgi.annotation.versioning.Version;