[Git][java-team/osgi-annotation][master] 9 commits: Declare compliance with Debian Policy 4.6.0.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Tue Nov 16 12:57:28 GMT 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / osgi-annotation
Commits:
4d4060ff by Markus Koschany at 2021-11-15T13:03:30+01:00
Declare compliance with Debian Policy 4.6.0.
- - - - -
b3cb0449 by Markus Koschany at 2021-11-16T13:04:02+01:00
Start new changelog entry
- - - - -
013a1adc by Markus Koschany at 2021-11-16T13:09:28+01:00
Use https for maven repo
- - - - -
0266e31d by Markus Koschany at 2021-11-16T13:09:43+01:00
Update debian/pom.xml for new upstream release
- - - - -
ab20b5e1 by Markus Koschany at 2021-11-16T13:10:12+01:00
New upstream version 8.0.1
- - - - -
2b4be9bb by Markus Koschany at 2021-11-16T13:10:13+01:00
Update upstream source from tag 'upstream/8.0.1'
Update to upstream version '8.0.1'
with Debian dir d15d17604f0471b24837cacbe22d3b3cc16d77ff
- - - - -
22af773b by Markus Koschany at 2021-11-16T13:11:55+01:00
Update debian/copyright for new release
- - - - -
9bf9a008 by Markus Koschany at 2021-11-16T13:24:14+01:00
Update Homepage field and point to osgi.org.
- - - - -
eb0336cf by Markus Koschany at 2021-11-16T13:25:34+01:00
Update changelog
- - - - -
21 changed files:
- META-INF/MANIFEST.MF
- debian/changelog
- debian/control
- debian/copyright
- debian/pom.xml
- debian/rules
- org/osgi/annotation/bundle/Attribute.java
- org/osgi/annotation/bundle/Capabilities.java
- org/osgi/annotation/bundle/Capability.java
- org/osgi/annotation/bundle/Directive.java
- org/osgi/annotation/bundle/Export.java
- org/osgi/annotation/bundle/Header.java
- org/osgi/annotation/bundle/Headers.java
- + org/osgi/annotation/bundle/Referenced.java
- org/osgi/annotation/bundle/Requirement.java
- org/osgi/annotation/bundle/Requirements.java
- org/osgi/annotation/bundle/package-info.java
- org/osgi/annotation/versioning/ConsumerType.java
- org/osgi/annotation/versioning/ProviderType.java
- org/osgi/annotation/versioning/Version.java
- org/osgi/annotation/versioning/package-info.java
Changes:
=====================================
META-INF/MANIFEST.MF
=====================================
@@ -1 +1,2 @@
Manifest-Version: 1.0
+
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+osgi-annotation (8.0.1-1) unstable; urgency=medium
+
+ * New upstream version 8.0.1.
+ * Declare compliance with Debian Policy 4.6.0.
+ * Update debian/pom.xml for new upstream release.
+ * Update debian/copyright for new release.
+ * Update Homepage field and point to osgi.org.
+
+ -- Markus Koschany <apo at debian.org> Tue, 16 Nov 2021 13:24:35 +0100
+
osgi-annotation (7.0.0-2) unstable; urgency=medium
* Don't specify the target in javadoc file because otherwise the doc-base
=====================================
debian/control
=====================================
@@ -10,10 +10,10 @@ Build-Depends:
default-jdk,
javahelper,
maven-repo-helper
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Vcs-Git: https://salsa.debian.org/java-team/osgi-annotation.git
Vcs-Browser: https://salsa.debian.org/java-team/osgi-annotation
-Homepage: http://www.osgi.org/Specifications/HomePage
+Homepage: https://www.osgi.org/
Package: libosgi-annotation-java
Architecture: all
=====================================
debian/copyright
=====================================
@@ -4,11 +4,11 @@ Upstream-Contact: OSGi Alliance (http://www.osgi.org/)
Source: http://repo1.maven.org/maven2/org/osgi/org.osgi.annotation/
Files: *
-Copyright: 2013-2014, OSGi Alliance
+Copyright: Contributors to the Eclipse Foundation
License: Apache-2.0
Files: debian/*
-Copyright: 2015-2020, Markus Koschany <apo at debian.org>
+Copyright: 2015-2021, Markus Koschany <apo at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/pom.xml
=====================================
@@ -3,34 +3,33 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
- <description>OSGi Annotation Release 7, Annotations for use in compiling bundles</description>
+ <version>8.0.1</version>
+ <description>OSGi Annotation Release 8, Annotations for use in compiling bundles</description>
<name>org.osgi:osgi.annotation</name>
- <url>https://www.osgi.org/</url>
+ <url>https://docs.osgi.org/</url>
<organization>
- <name>OSGi Alliance</name>
- <url>https://www.osgi.org/</url>
+ <name>Eclipse Foundation</name>
</organization>
<licenses>
<license>
<name>Apache-2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ <url>https://opensource.org/licenses/Apache-2.0</url>
<distribution>repo</distribution>
- <comments>Apache License, Version 2.0</comments>
+ <comments>This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0.</comments>
</license>
</licenses>
<scm>
- <url>https://osgi.org/gitweb/build.git</url>
- <connection>scm:git:https://osgi.org/git/build.git</connection>
- <developerConnection>scm:git:https://osgi.org/git/build.git</developerConnection>
- <tag>hudson-build.core-1432</tag>
+ <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>
</scm>
<developers>
<developer>
<id>osgi</id>
- <email>info at osgi.org</email>
- <name>OSGi Alliance</name>
- <organization>OSGi Alliance</organization>
+ <email>osgi-wg at eclipse.org</email>
+ <name>OSGi Working Group</name>
+ <organization>Eclipse Foundation</organization>
<organizationUrl>https://www.osgi.org/</organizationUrl>
</developer>
</developers>
=====================================
debian/rules
=====================================
@@ -2,7 +2,7 @@
export JAVA_HOME := /usr/lib/jvm/default-java
-MAVEN_REPO := http://repo1.maven.org/maven2/org/osgi/osgi.annotation
+MAVEN_REPO := https://repo1.maven.org/maven2/org/osgi/osgi.annotation
VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//')
JAR_NAME := osgi.annotation
PACKAGE := libosgi-annotation-java
=====================================
org/osgi/annotation/bundle/Attribute.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016, 2018). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -60,7 +62,7 @@ import java.lang.annotation.Target;
* This annotation is not retained at runtime. It is for use by tools to
* generate bundle manifests.
*
- * @author $Id: 78245cbc51f58d2308bbfa600059b9f524979954 $
+ * @author $Id: 126200a2e0f44e2a27bb8c43232d4b4386cc02dd $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/bundle/Capabilities.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -25,7 +27,7 @@ import java.lang.annotation.Target;
/**
* Container annotation for repeated {@link Capability} annotations.
*
- * @author $Id: 66ba91e3c6527e7baf58107b0d41e8961094198a $
+ * @author $Id: 6b6276fde5b7ad37c142d2377a0f5d8fad432e48 $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/bundle/Capability.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016, 2018). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -36,12 +38,9 @@ import java.lang.annotation.Target;
* This annotation is not retained at runtime. It is for use by tools to
* generate bundle manifests or otherwise process the type or package.
* <p>
- * This annotation can be used to annotate an annotation. If the meta-annotated
- * annotation declares an element of the same name as an element in this
- * annotation, the element is considered to override the element in this
- * annotation.
+ * This annotation can be used to annotate an annotation
*
- * @author $Id: bf3cb5ae29bf95f25c8e217e3807c232b1ffb96c $
+ * @author $Id: 11a1102cbf7b185c0cae0a0b34da890439d078d6 $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
@@ -106,7 +105,7 @@ public @interface Capability {
* <li>{@code "name:type=value"} for typed attributes.</li>
* <li>{@code "name:=value"} for directives.</li>
* </ul>
- * These are added, separated by semicolons, to the export package clause.
+ * These are added, separated by semicolons, to the capability clause.
*/
String[] attribute() default {};
}
=====================================
org/osgi/annotation/bundle/Directive.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016, 2018). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -60,7 +62,7 @@ import java.lang.annotation.Target;
* This annotation is not retained at runtime. It is for use by tools to
* generate bundle manifests.
*
- * @author $Id: b0e9776264d7c1598147b7c9826e92e7224aae35 $
+ * @author $Id: 3cb5691a604299a07e1f80e708f2201311d03f6c $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/bundle/Export.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016). All Rights Reserved.
- *
- * Licensed under the Apache License, Export 2.0 (the "License");
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -35,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: 8e77e5578eea93b272d22c0824d0e133c6ff44bf $
+ * @author $Id: 281871a62a21c8b789393ae591c3d8f3d424e5fd $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/bundle/Header.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -35,7 +37,7 @@ import java.lang.annotation.Target;
* This annotation is not retained at runtime. It is for use by tools to
* generate bundle manifests.
*
- * @author $Id: 7f055fcd764d4e5cb2f7ea10bc77dbc808df068a $
+ * @author $Id: 2dde5d7c3ed43968e3354a0b12fc0653eed71efc $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/bundle/Headers.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -25,7 +27,7 @@ import java.lang.annotation.Target;
/**
* Container annotation for repeated {@link Header} annotations.
*
- * @author $Id: 70dba5395acc84b1371c31bec21f15b0edf03196 $
+ * @author $Id: be4ab77e12eac61d3efe207ac94a2687bb31c76c $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/bundle/Referenced.java
=====================================
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
+
+package org.osgi.annotation.bundle;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark types as referenced.
+ * <p>
+ * A reference can cause the package of a specified type to be imported if the
+ * bundle does not contain the package.
+ * <p>
+ * This annotation is not retained at runtime. It is for use by tools to
+ * generate bundle manifests.
+ *
+ * @author $Id: decc490d50f3af3eb76857061a324e9540761d92 $
+ */
+ at Documented
+ at Retention(RetentionPolicy.CLASS)
+ at Target({
+ ElementType.TYPE, ElementType.PACKAGE
+})
+public @interface Referenced {
+ /**
+ * A list of referenced classes.
+ * <p>
+ * Specifying a class in this annotation must be treated by tools as if the
+ * annotated type has a code reference to the class which may result in an
+ * import of the package of the class if the bundle does not contain that
+ * package.
+ */
+ Class< ? >[] value();
+}
=====================================
org/osgi/annotation/bundle/Requirement.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016, 2018). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -36,12 +38,9 @@ import java.lang.annotation.Target;
* This annotation is not retained at runtime. It is for use by tools to
* generate bundle manifests or otherwise process the a package.
* <p>
- * This annotation can be used to annotate an annotation. If the meta-annotated
- * annotation declares an element of the same name as an element in this
- * annotation, the element is considered to override the element in this
- * annotation.
+ * This annotation can be used to annotate an annotation.
*
- * @author $Id: f3ba4bcd99d63afe386b98e17adf8dab456312e2 $
+ * @author $Id: 5ce4279b29f0f3b383b4e538c6d1ba512aecbac8 $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
@@ -107,7 +106,7 @@ public @interface Requirement {
* <li>{@code "name:type=value"} for typed attributes.</li>
* <li>{@code "name:=value"} for directives.</li>
* </ul>
- * These are added, separated by semicolons, to the export package clause.
+ * These are added, separated by semicolons, to the requirement clause.
*/
String[] attribute() default {};
=====================================
org/osgi/annotation/bundle/Requirements.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2016). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.bundle;
@@ -25,7 +27,7 @@ import java.lang.annotation.Target;
/**
* Container annotation for repeated {@link Requirement} annotations.
*
- * @author $Id: 5d5354fddd97ea582c70caeffccf8e36904cae4c $
+ * @author $Id: 1e56410ce9096ae6cf904dafd388f1b43a283099 $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/bundle/package-info.java
=====================================
@@ -1,27 +1,29 @@
-/*
- * Copyright (c) OSGi Alliance (2016). All Rights Reserved.
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
*
- * Licensed under the Apache License, Export 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
/**
- * OSGi Bundle Annotations Package Version 1.0.
+ * OSGi Bundle Annotations Package Version 1.1.
* <p>
* This package is not used at runtime.
*
- * @author $Id: f1e867c6f15cade9f8e8f280826c856175018bf6 $
+ * @author $Id: 12d53d4428271bf289b774cef31987b288e3f884 $
*/
- at Version("1.0")
+ at Version("1.1.1")
package org.osgi.annotation.bundle;
import org.osgi.annotation.versioning.Version;
=====================================
org/osgi/annotation/versioning/ConsumerType.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2013, 2017). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.versioning;
@@ -52,10 +54,9 @@ import java.lang.annotation.Target;
* that package must require the exact major version and a minor version greater
* than or equal to the package's version.
*
- * @see <a href=
- * "https://www.osgi.org/wp-content/uploads/SemanticVersioning1.pdf" >
+ * @see <a href= "https://docs.osgi.org/whitepaper/semantic-versioning/" >
* Semantic Versioning</a>
- * @author $Id: 0224e9ea28abfaf6e5fcba33ade5c24b67d3a86c $
+ * @author $Id: 007d63295bff57b4d091d65a3b676a9a596b112b $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/versioning/ProviderType.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2013, 2017). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.versioning;
@@ -54,10 +56,9 @@ import java.lang.annotation.Target;
* provider type from an imported package, then the bundle's import range for
* that package must require the package's exact major and minor version.
*
- * @see <a href=
- * "https://www.osgi.org/wp-content/uploads/SemanticVersioning1.pdf" >
+ * @see <a href= "https://docs.osgi.org/whitepaper/semantic-versioning/" >
* Semantic Versioning</a>
- * @author $Id: fccf9ca53cf68e15c1745839770da594ae3111ec $
+ * @author $Id: e185903da522dd7b8e6a656eaf5f1548534a961e $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/versioning/Version.java
=====================================
@@ -1,18 +1,20 @@
-/*
- * Copyright (c) OSGi Alliance (2013, 2016). All Rights Reserved.
- *
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
package org.osgi.annotation.versioning;
@@ -28,10 +30,9 @@ import java.lang.annotation.Target;
* This annotation is not retained at runtime. It is for use by tools to
* generate bundle manifests or otherwise process the version of a package.
*
- * @see <a href=
- * "https://www.osgi.org/wp-content/uploads/SemanticVersioning1.pdf" >
+ * @see <a href= "https://docs.osgi.org/whitepaper/semantic-versioning/" >
* Semantic Versioning</a>
- * @author $Id: 7121973d858c761b1093ea198d516fa492655ae1 $
+ * @author $Id: 6e4361486f9f41adbfadba45e4f07f83ea81864e $
*/
@Documented
@Retention(RetentionPolicy.CLASS)
=====================================
org/osgi/annotation/versioning/package-info.java
=====================================
@@ -1,29 +1,30 @@
-/*
- * Copyright (c) OSGi Alliance (2013, 2016). All Rights Reserved.
+/*******************************************************************************
+ * Copyright (c) Contributors to the Eclipse Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
/**
* OSGi Versioning Annotations Package Version 1.1.
* <p>
* This package is not used at runtime.
*
- * @see <a href=
- * "https://www.osgi.org/wp-content/uploads/SemanticVersioning1.pdf" >
+ * @see <a href= "https://docs.osgi.org/whitepaper/semantic-versioning/" >
* Semantic Versioning</a>
- * @author $Id: 2ff0bf766254e2570f961cd0260349635fa5ed3b $
+ * @author $Id: 322b26069473b0ea06a29cd95992327b9fd65ddf $
*/
- at Version("1.1")
+ at Version("1.1.2")
package org.osgi.annotation.versioning;
View it on GitLab: https://salsa.debian.org/java-team/osgi-annotation/-/compare/bc2935a3d0084fbb3ea3e32449f33abeaee8ec18...eb0336cfd360a51310107f109e4eb6bb38aedc74
--
View it on GitLab: https://salsa.debian.org/java-team/osgi-annotation/-/compare/bc2935a3d0084fbb3ea3e32449f33abeaee8ec18...eb0336cfd360a51310107f109e4eb6bb38aedc74
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/20211116/caaa2f32/attachment.htm>
More information about the pkg-java-commits
mailing list