[Git][java-team/geronimo-annotation-1.3-spec][upstream] 3 commits: New upstream version 1.1
Emmanuel Bourg
gitlab at salsa.debian.org
Thu Jan 21 14:24:38 GMT 2021
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / geronimo-annotation-1.3-spec
Commits:
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
- - - - -
4 changed files:
- NOTICE
- 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/).
=====================================
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/0d43c4065d457be3578c55b1f9803c0c881e4599...6c6050b629e59cb4dfee50d3d932dc76701abdf0
--
View it on GitLab: https://salsa.debian.org/java-team/geronimo-annotation-1.3-spec/-/compare/0d43c4065d457be3578c55b1f9803c0c881e4599...6c6050b629e59cb4dfee50d3d932dc76701abdf0
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/efe869b9/attachment.html>
More information about the pkg-java-commits
mailing list