[Git][java-team/osgi-annotation][master] 6 commits: New upstream version 8.1.0
Markus Koschany (@apo)
gitlab at salsa.debian.org
Tue Aug 9 14:57:09 BST 2022
Markus Koschany pushed to branch master at Debian Java Maintainers / osgi-annotation
Commits:
640cc55b by Markus Koschany at 2022-08-09T15:15:25+02:00
New upstream version 8.1.0
- - - - -
efca6011 by Markus Koschany at 2022-08-09T15:15:25+02:00
Update upstream source from tag 'upstream/8.1.0'
Update to upstream version '8.1.0'
with Debian dir 9e3da8484abe7d87ba15683a59d0b87191a1461f
- - - - -
838a1488 by Markus Koschany at 2022-08-09T15:15:49+02:00
Update copyright years
- - - - -
a01cf448 by Markus Koschany at 2022-08-09T15:16:43+02:00
Declare compliance with Debian Policy 4.6.1.
- - - - -
b00ebd2e by Markus Koschany at 2022-08-09T15:17:41+02:00
Update changelog
- - - - -
1b834b29 by Markus Koschany at 2022-08-09T15:18:02+02:00
Update debian/pom.xml
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/pom.xml
- org/osgi/annotation/bundle/Export.java
- org/osgi/annotation/bundle/Requirement.java
- org/osgi/annotation/bundle/package-info.java
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+osgi-annotation (8.1.0-1) unstable; urgency=medium
+
+ * New upstream version 8.1.0.
+ * Declare compliance with Debian Policy 4.6.1.
+
+ -- Markus Koschany <apo at debian.org> Tue, 09 Aug 2022 15:17:27 +0200
+
osgi-annotation (8.0.1-1) unstable; urgency=medium
* New upstream version 8.0.1.
=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends:
default-jdk,
javahelper,
maven-repo-helper
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/osgi-annotation.git
Vcs-Browser: https://salsa.debian.org/java-team/osgi-annotation
Homepage: https://www.osgi.org/
=====================================
debian/copyright
=====================================
@@ -8,7 +8,7 @@ Copyright: Contributors to the Eclipse Foundation
License: Apache-2.0
Files: debian/*
-Copyright: 2015-2021, Markus Koschany <apo at debian.org>
+Copyright: 2015-2022, Markus Koschany <apo at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/pom.xml
=====================================
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>8.0.1</version>
+ <version>8.1.0</version>
<description>OSGi Annotation Release 8, Annotations for use in compiling bundles</description>
<name>org.osgi:osgi.annotation</name>
<url>https://docs.osgi.org/</url>
@@ -22,7 +22,7 @@
<url>https://github.com/osgi/osgi</url>
<connection>scm:git:https://github.com/osgi/osgi.git</connection>
<developerConnection>scm:git:git at github.com:osgi/osgi.git</developerConnection>
- <tag>r8-cmpn-final</tag>
+ <tag>8.0.0.1</tag>
</scm>
<developers>
<developer>
=====================================
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";
}
}
=====================================
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
}
}
=====================================
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 $
*/
- at Version("1.1.1")
+ at Version("2.0")
package org.osgi.annotation.bundle;
import org.osgi.annotation.versioning.Version;
View it on GitLab: https://salsa.debian.org/java-team/osgi-annotation/-/compare/eb0336cfd360a51310107f109e4eb6bb38aedc74...1b834b2922585992ceefa311b51994abcc829481
--
View it on GitLab: https://salsa.debian.org/java-team/osgi-annotation/-/compare/eb0336cfd360a51310107f109e4eb6bb38aedc74...1b834b2922585992ceefa311b51994abcc829481
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220809/d0b82fff/attachment.htm>
More information about the pkg-java-commits
mailing list