[Git][java-team/geronimo-annotation-1.3-spec][master] 11 commits: Standards-Version updated to 4.5.1
Emmanuel Bourg
gitlab at salsa.debian.org
Thu Jan 21 14:24:34 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / geronimo-annotation-1.3-spec
Commits:
17baf1d0 by Emmanuel Bourg at 2021-01-21T11:15:12+01:00
Standards-Version updated to 4.5.1
- - - - -
afeef42b by Emmanuel Bourg at 2021-01-21T11:15:18+01:00
Switch to debhelper level 13
- - - - -
836a081a by Emmanuel Bourg at 2021-01-21T11:15:25+01:00
Use salsa.debian.org Vcs-* URLs
- - - - -
c9d165f8 by Emmanuel Bourg at 2021-01-21T11:18:52+01:00
Removed debian/orig-tar.sh
- - - - -
9fe9585d by Emmanuel Bourg at 2021-01-21T11:19:08+01:00
New upstream version 1.1
- - - - -
11618732 by Emmanuel Bourg at 2021-01-21T11:19:17+01:00
New upstream version 1.2
- - - - -
6c6050b6 by Emmanuel Bourg at 2021-01-21T11:19:22+01:00
New upstream version 1.3
- - - - -
b2eef3da by Emmanuel Bourg at 2021-01-21T11:19:22+01:00
Update upstream source from tag 'upstream/1.3'
Update to upstream version '1.3'
with Debian dir 020686cda34509834ac55977b8de7e5e10d910f1
- - - - -
a7929c68 by Emmanuel Bourg at 2021-01-21T11:21:26+01:00
Refreshed the patch
- - - - -
e8ebb20e by Emmanuel Bourg at 2021-01-21T11:28:52+01:00
Don't build the new jakarta artifact (use jakarta-annotation-api instead)
- - - - -
c11d4e65 by Emmanuel Bourg at 2021-01-21T11:29:00+01:00
Upload to unstable
- - - - -
12 changed files:
- NOTICE
- debian/changelog
- − debian/compat
- debian/control
- + debian/maven.ignoreRules
- − debian/orig-tar.sh
- debian/patches/01-maven-bundle-extension.patch
- debian/rules
- debian/watch
- pom.xml
- src/main/java/javax/annotation/Resource.java
- src/main/java/javax/annotation/sql/DataSourceDefinition.java
Changes:
=====================================
NOTICE
=====================================
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2014 The Apache Software Foundation
+Copyright 2003-2018 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+geronimo-annotation-1.3-spec (1.3-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refreshed the patch
+ - Don't build the new jakarta artifact (use jakarta-annotation-api instead)
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+ * Use salsa.debian.org Vcs-* URLs
+ * Removed debian/orig-tar.sh
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 21 Jan 2021 11:28:55 +0100
+
geronimo-annotation-1.3-spec (1.0-1) unstable; urgency=medium
* Initial release (Closes: #875854)
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -4,13 +4,13 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Emmanuel Bourg <ebourg at apache.org>
Build-Depends:
- debhelper (>= 10),
+ debhelper-compat (= 13),
default-jdk,
libmaven-bundle-plugin-java,
maven-debian-helper (>= 2.2)
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/geronimo-annotation-1.3-spec.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/geronimo-annotation-1.3-spec.git
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/geronimo-annotation-1.3-spec.git
+Vcs-Browser: https://salsa.debian.org/java-team/geronimo-annotation-1.3-spec
Homepage: http://geronimo.apache.org
Package: libgeronimo-annotation-1.3-spec-java
=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1,2 @@
+
+org.apache.maven.plugins maven-shade-plugin
=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-#
-# Removes unwanted content from the upstream sources.
-# Called by uscan with '--upstream-version' <version> <file>
-#
-
-VERSION=$2
-PACKAGE=$(dpkg-parsechangelog -S Source)
-TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
-DIR=${PACKAGE}-${VERSION}
-TAG=$(echo "geronimo-annotation_1.3_spec-$VERSION" | sed -re's/~(alpha|beta|rc)/-\1/')
-
-svn export https://svn.apache.org/repos/asf/geronimo/specs/tags/${TAG}/ $DIR
-XZ_OPT=--best tar -c -v -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
=====================================
debian/patches/01-maven-bundle-extension.patch
=====================================
@@ -7,7 +7,7 @@ Forwarded: not-needed
@@ -61,6 +61,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>3.5.0</version>
+ <extensions>true</extensions>
<configuration>
<instructions>
=====================================
debian/rules
=====================================
@@ -2,6 +2,3 @@
%:
dh $@
-
-get-orig-source:
- uscan --download-current-version --force-download --no-symlink
=====================================
debian/watch
=====================================
@@ -1,4 +1,3 @@
-version=3
-opts="uversionmangle=s/-(alpha|beta|rc|EA)(-)?/~$1$2/" \
- http://svn.apache.org/repos/asf/geronimo/specs/tags/ \
- geronimo-annotation_1.3_spec-(\d.*)/ debian debian/orig-tar.sh
+version=4
+opts="mode=svn,uversionmangle=s/-(alpha|beta|rc|EA)(-)?/~$1$2/" \
+https://svn.apache.org/repos/asf/geronimo/specs/tags/ geronimo-annotation_1.3_spec-(\d.*)/
=====================================
pom.xml
=====================================
@@ -18,7 +18,7 @@
under the License.
-->
-<!-- $Rev: 1799983 $ $Date: 2017-06-26 22:33:46 +0200 (Mon, 26 Jun 2017) $ -->
+<!-- $Rev: 1877104 $ $Date: 2020-04-28 07:49:47 +0200 (Tue, 28 Apr 2020) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -34,7 +34,7 @@
<artifactId>geronimo-annotation_1.3_spec</artifactId>
<packaging>bundle</packaging>
<name>Apache Geronimo Annotation Spec 1.3</name>
- <version>1.0</version>
+ <version>1.3</version>
<description>Common Annotations spec 1.3 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
@@ -50,9 +50,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-annotation_1.3_spec-1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-annotation_1.3_spec-1.0</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/tags/geronimo-annotation_1.3_spec-1.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-annotation_1.3_spec-1.3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-annotation_1.3_spec-1.3</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/tags/geronimo-annotation_1.3_spec-1.3</url>
</scm>
<build>
@@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>3.5.0</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -68,9 +68,41 @@
<Specification-Vendor>Oracle, Inc.</Specification-Vendor>
<Specification-Version>1.3</Specification-Version>
<Export-Package>javax.annotation*;version=1.3</Export-Package>
+ <Provide-Capability><![CDATA[
+ osgi.contract;osgi.contract=JavaAnnotation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.3,1.2,1.1,1.0'
+ ]]></Provide-Capability>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>jakarta</shadedClassifierName>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <artifactSet> <!-- don't include transitive deps -->
+ <includes>
+ <include>${project.groupId}:${project.artifactId}</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>javax</pattern>
+ <shadedPattern>jakarta</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
=====================================
src/main/java/javax/annotation/Resource.java
=====================================
@@ -24,16 +24,18 @@
//
package javax.annotation;
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
/**
- * @version $Rev: 1796920 $ $Date: 2017-05-30 21:47:40 +0200 (Tue, 30 May 2017) $
+ * @version $Rev: 1866293 $ $Date: 2019-09-02 22:50:01 +0200 (Mon, 02 Sep 2019) $
*/
@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
+ at Repeatable(Resources.class)
public @interface Resource {
enum AuthenticationType {
CONTAINER,
@@ -42,7 +44,7 @@ public @interface Resource {
String name() default "";
- Class type() default Object.class;
+ Class<?> type() default Object.class;
AuthenticationType authenticationType()
default AuthenticationType.CONTAINER;
=====================================
src/main/java/javax/annotation/sql/DataSourceDefinition.java
=====================================
@@ -22,6 +22,8 @@
package javax.annotation.sql;
import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@@ -31,6 +33,7 @@ import java.lang.annotation.Target;
*/
@Retention(RUNTIME)
@Target({TYPE})
+ at Repeatable(DataSourceDefinitions.class)
public @interface DataSourceDefinition {
boolean transactional() default true;
View it on GitLab: https://salsa.debian.org/java-team/geronimo-annotation-1.3-spec/-/compare/1d17a1d05cb69d06270f9aa0b535a798c3e9a49d...c11d4e658fecdbf07133c3ec074e5db5f286ac94
--
View it on GitLab: https://salsa.debian.org/java-team/geronimo-annotation-1.3-spec/-/compare/1d17a1d05cb69d06270f9aa0b535a798c3e9a49d...c11d4e658fecdbf07133c3ec074e5db5f286ac94
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/20210121/9ed19365/attachment.html>
More information about the pkg-java-commits
mailing list