You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/05/16 12:19:14 UTC
[tomcat] branch main updated (bd49eed3a5 -> e186d7e337)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from bd49eed3a5 Additional file requiring version format tweak
new 30253cd1de Add new annotations for Annotations API 2.1
new 51e5cb22f2 Align with Jakarta Annotations API 2.1
new e186d7e337 Jakarta Annotations API 2.1 is final and has been released
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 2 +-
.../PersistenceProperty.java => annotation/Nonnull.java} | 14 ++++++++------
.../PersistenceProperty.java => annotation/Nullable.java} | 14 ++++++++------
java/jakarta/annotation/Priority.java | 3 ---
java/jakarta/annotation/Resource.java | 2 ++
java/jakarta/annotation/sql/DataSourceDefinition.java | 2 ++
res/META-INF/annotations-api.jar.manifest | 2 +-
res/bnd/annotations-api.jar.tmp.bnd | 2 +-
8 files changed, 23 insertions(+), 18 deletions(-)
copy java/jakarta/{persistence/PersistenceProperty.java => annotation/Nonnull.java} (85%)
copy java/jakarta/{persistence/PersistenceProperty.java => annotation/Nullable.java} (85%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Add new annotations for Annotations API 2.1
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 30253cd1deb3c4d62f4a055d3d8de5d138b04fbd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 16 13:00:29 2022 +0100
Add new annotations for Annotations API 2.1
---
java/jakarta/annotation/Nonnull.java | 31 +++++++++++++++++++++++++++++++
java/jakarta/annotation/Nullable.java | 31 +++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/java/jakarta/annotation/Nonnull.java b/java/jakarta/annotation/Nonnull.java
new file mode 100644
index 0000000000..7fac3b8e57
--- /dev/null
+++ b/java/jakarta/annotation/Nonnull.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package jakarta.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @since Common Annotations 2.1
+ *
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Nonnull {
+
+}
diff --git a/java/jakarta/annotation/Nullable.java b/java/jakarta/annotation/Nullable.java
new file mode 100644
index 0000000000..7ec2e1e715
--- /dev/null
+++ b/java/jakarta/annotation/Nullable.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package jakarta.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @since Common Annotations 2.1
+ *
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Nullable {
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Align with Jakarta Annotations API 2.1
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 51e5cb22f2ba2b2b2e695c71bf189b40db8ae860
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 16 13:01:07 2022 +0100
Align with Jakarta Annotations API 2.1
---
java/jakarta/annotation/Priority.java | 3 ---
java/jakarta/annotation/Resource.java | 2 ++
java/jakarta/annotation/sql/DataSourceDefinition.java | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java/jakarta/annotation/Priority.java b/java/jakarta/annotation/Priority.java
index 74dce8bb70..53c7904080 100644
--- a/java/jakarta/annotation/Priority.java
+++ b/java/jakarta/annotation/Priority.java
@@ -17,16 +17,13 @@
package jakarta.annotation;
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;
/**
* @since Common Annotations 1.2
*/
@Documented
-@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface Priority {
diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java
index 746da43e92..6677224f82 100644
--- a/java/jakarta/annotation/Resource.java
+++ b/java/jakarta/annotation/Resource.java
@@ -17,6 +17,7 @@
package jakarta.annotation;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -26,6 +27,7 @@ import java.lang.annotation.Target;
*/
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Resources.class)
public @interface Resource {
/**
diff --git a/java/jakarta/annotation/sql/DataSourceDefinition.java b/java/jakarta/annotation/sql/DataSourceDefinition.java
index cfbf7f69d0..9e5c46d0f3 100644
--- a/java/jakarta/annotation/sql/DataSourceDefinition.java
+++ b/java/jakarta/annotation/sql/DataSourceDefinition.java
@@ -17,6 +17,7 @@
package jakarta.annotation.sql;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -26,6 +27,7 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(DataSourceDefinitions.class)
public @interface DataSourceDefinition {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Jakarta Annotations API 2.1 is final and has been released
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e186d7e337980c9160ece6b22ba1a0504ce3de44
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 16 13:19:02 2022 +0100
Jakarta Annotations API 2.1 is final and has been released
---
build.xml | 2 +-
res/META-INF/annotations-api.jar.manifest | 2 +-
res/bnd/annotations-api.jar.tmp.bnd | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 68150b4041..0c9dbf3f3e 100644
--- a/build.xml
+++ b/build.xml
@@ -66,7 +66,7 @@
<property name="jaspic.spec.version" value="3.0" />
<property name="jaspic.revision" value="-SNAPSHOT" />
<property name="annotation.spec.version" value="2.1" />
- <property name="annotation.revision" value="-SNAPSHOT" />
+ <property name="annotation.revision" value="" />
<!-- Release artifact base names -->
<property name="final.name" value="${project}-${version}" />
diff --git a/res/META-INF/annotations-api.jar.manifest b/res/META-INF/annotations-api.jar.manifest
index dbb3410efd..7ad1a8d86b 100644
--- a/res/META-INF/annotations-api.jar.manifest
+++ b/res/META-INF/annotations-api.jar.manifest
@@ -7,5 +7,5 @@ Specification-Title: Jakarta Annotations
Specification-Version: @annotation.spec.version@
Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.annotation
-Implementation-Version: @annotation.spec.version@.@annotation.revision@
+Implementation-Version: @annotation.spec.version@@annotation.revision@
Implementation-Vendor: Apache Software Foundation
diff --git a/res/bnd/annotations-api.jar.tmp.bnd b/res/bnd/annotations-api.jar.tmp.bnd
index 7caf115657..5bbcea4468 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -31,7 +31,7 @@ Provide-Capability: \
Specification-Version=${annotation.spec.version};\
Specification-Vendor=Eclipse Foundation;\
Implementation-Title=jakarta.annotation;\
- Implementation-Version=${annotation.spec.version}.${annotation.revision};\
+ Implementation-Version=${annotation.spec.version}${annotation.revision};\
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org