diff --git a/.travis.yml b/.travis.yml index 5069163..600289c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,16 @@ -dist: trusty +dist: bionic language: java sudo: false jdk: - oraclejdk11 - openjdk11 + - oraclejdk14 + - openjdk14 cache: directories: - $HOME/.m2 script: - - mvn verify -B -V \ No newline at end of file + - mvn -f api/pom.xml verify -B -V \ No newline at end of file diff --git a/api/pom.xml b/api/pom.xml index 6f810c0..0b245e8 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -1,7 +1,7 @@ + ${copyright.scmonly} + + ${copyright.update} + + ${copyright.ignoreyear} + + + + validate + + check + + + + org.codehaus.mojo build-helper-maven-plugin @@ -238,9 +279,6 @@ org.apache.felix maven-bundle-plugin - - jar - ${spec.bundle.version} ${spec.bundle.symbolic-name} @@ -276,89 +314,46 @@ org.apache.maven.plugins maven-source-plugin - true + + + false + true + + + ${buildNumber} + + - - - attach-sources - - jar-no-fork - - - org.apache.maven.plugins maven-javadoc-plugin - 8 - Jakarta Annotations ${project.version} API Specification - - --frames - - - module-info.java - + + + false + + + 11 + --add-modules java.sql true true - - http://docs.oracle.com/javase/8/docs/api/ - - false - false -
Jakarta Annotations API v${project.version}]]> -
+ Jakarta Annotations ${project.version} API Specification +
Jakarta Annotations API v${project.version}]]>
Use is subject to license terms.]]> - - - attach-javadocs - - jar - - - - org.codehaus.mojo - findbugs-maven-plugin + com.github.spotbugs + spotbugs-maven-plugin - ${findbugs.threshold} - ${findbugs.exclude} - true + ${spotbugs.skip} + ${spotbugs.threshold} true - - - - org.apache.maven.plugins - maven-release-plugin - - forked-path - false - ${release.arguments} - @{project.version} - - - - org.apache.maven.plugins - maven-site-plugin - - - - - org.codehaus.mojo - findbugs-maven-plugin - ${findbugs.version} - - ${findbugs.threshold} - ${findbugs.exclude} - - - - + true diff --git a/api/src/main/java/jakarta/annotation/Generated.java b/api/src/main/java/jakarta/annotation/Generated.java index 931b37f..8ccd0de 100644 --- a/api/src/main/java/jakarta/annotation/Generated.java +++ b/api/src/main/java/jakarta/annotation/Generated.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/ManagedBean.java b/api/src/main/java/jakarta/annotation/ManagedBean.java index 2c7af96..03e3f96 100644 --- a/api/src/main/java/jakarta/annotation/ManagedBean.java +++ b/api/src/main/java/jakarta/annotation/ManagedBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/PostConstruct.java b/api/src/main/java/jakarta/annotation/PostConstruct.java index 6d69ac1..a00c86b 100644 --- a/api/src/main/java/jakarta/annotation/PostConstruct.java +++ b/api/src/main/java/jakarta/annotation/PostConstruct.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/PreDestroy.java b/api/src/main/java/jakarta/annotation/PreDestroy.java index b092329..3bfea8d 100644 --- a/api/src/main/java/jakarta/annotation/PreDestroy.java +++ b/api/src/main/java/jakarta/annotation/PreDestroy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/Priority.java b/api/src/main/java/jakarta/annotation/Priority.java index 2f3b619..e77cb0e 100644 --- a/api/src/main/java/jakarta/annotation/Priority.java +++ b/api/src/main/java/jakarta/annotation/Priority.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/Resource.java b/api/src/main/java/jakarta/annotation/Resource.java index e81ba23..cb39804 100644 --- a/api/src/main/java/jakarta/annotation/Resource.java +++ b/api/src/main/java/jakarta/annotation/Resource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/Resources.java b/api/src/main/java/jakarta/annotation/Resources.java index e8ca0f4..eaa2d4c 100644 --- a/api/src/main/java/jakarta/annotation/Resources.java +++ b/api/src/main/java/jakarta/annotation/Resources.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/package-info.java b/api/src/main/java/jakarta/annotation/package-info.java index 5bddc26..f108b8c 100644 --- a/api/src/main/java/jakarta/annotation/package-info.java +++ b/api/src/main/java/jakarta/annotation/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/security/DeclareRoles.java b/api/src/main/java/jakarta/annotation/security/DeclareRoles.java index 8028741..36c1ce8 100644 --- a/api/src/main/java/jakarta/annotation/security/DeclareRoles.java +++ b/api/src/main/java/jakarta/annotation/security/DeclareRoles.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/security/DenyAll.java b/api/src/main/java/jakarta/annotation/security/DenyAll.java index eee827e..e32a7e1 100644 --- a/api/src/main/java/jakarta/annotation/security/DenyAll.java +++ b/api/src/main/java/jakarta/annotation/security/DenyAll.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/security/PermitAll.java b/api/src/main/java/jakarta/annotation/security/PermitAll.java index a59e374..256bee9 100644 --- a/api/src/main/java/jakarta/annotation/security/PermitAll.java +++ b/api/src/main/java/jakarta/annotation/security/PermitAll.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/security/RolesAllowed.java b/api/src/main/java/jakarta/annotation/security/RolesAllowed.java index a2163e4..9c717de 100644 --- a/api/src/main/java/jakarta/annotation/security/RolesAllowed.java +++ b/api/src/main/java/jakarta/annotation/security/RolesAllowed.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/security/RunAs.java b/api/src/main/java/jakarta/annotation/security/RunAs.java index b94af77..5a744eb 100644 --- a/api/src/main/java/jakarta/annotation/security/RunAs.java +++ b/api/src/main/java/jakarta/annotation/security/RunAs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/security/package-info.java b/api/src/main/java/jakarta/annotation/security/package-info.java index 14e9c5c..7482fd3 100644 --- a/api/src/main/java/jakarta/annotation/security/package-info.java +++ b/api/src/main/java/jakarta/annotation/security/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/sql/DataSourceDefinition.java b/api/src/main/java/jakarta/annotation/sql/DataSourceDefinition.java index 5f74622..5cd4bfd 100644 --- a/api/src/main/java/jakarta/annotation/sql/DataSourceDefinition.java +++ b/api/src/main/java/jakarta/annotation/sql/DataSourceDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/java/jakarta/annotation/sql/DataSourceDefinitions.java b/api/src/main/java/jakarta/annotation/sql/DataSourceDefinitions.java index c69aa5a..cd9bfa9 100644 --- a/api/src/main/java/jakarta/annotation/sql/DataSourceDefinitions.java +++ b/api/src/main/java/jakarta/annotation/sql/DataSourceDefinitions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/api/src/main/javadoc/doc-files/EFSL.html b/api/src/main/javadoc/doc-files/EFSL.html index ba29e5e..4a2cd9b 100644 --- a/api/src/main/javadoc/doc-files/EFSL.html +++ b/api/src/main/javadoc/doc-files/EFSL.html @@ -1,5 +1,23 @@ + + Eclipse Foundation Specification License - v1.0 diff --git a/pom.xml b/pom.xml deleted file mode 100644 index e2520fd..0000000 --- a/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.ee4j - project - 1.0.6 - - - jakarta.annotation - ca-parent - pom - 2.0-SNAPSHOT - - 2004 - - Jakarta Annotations Parent POM - Jakarta Annotations Parent POM - - https://projects.eclipse.org/projects/ee4j.ca - - - scm:git:https://github.com/eclipse-ee4j/common-annotations-api.git - scm:git:git@github.com:eclipse-ee4j/common-annotations-api.git - https://github.com/eclipse-ee4j/common-annotations-api - HEAD - - - - false - 1.3 - jakarta.annotation - Oracle Corporation - org.glassfish - 3.0.5 - exclude.xml - Low - - - - api - spec - - - - - EPL 2.0 - http://www.eclipse.org/legal/epl-2.0 - repo - - - GPL2 w/ CPE - https://www.gnu.org/software/classpath/license.html - repo - - -