[Git][java-team/jakarta-annotation-api][master] 5 commits: New upstream version 2.0.0
Emmanuel Bourg
gitlab at salsa.debian.org
Sun Jul 26 22:10:21 BST 2020
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jakarta-annotation-api
Commits:
de56558a by Emmanuel Bourg at 2020-07-26T19:21:19+02:00
New upstream version 2.0.0
- - - - -
04153d41 by Emmanuel Bourg at 2020-07-26T19:21:20+02:00
Update upstream source from tag 'upstream/2.0.0'
Update to upstream version '2.0.0'
with Debian dir 3ce2f6623b969b484bb2877ddec08c56e643dfb1
- - - - -
bf11490e by Emmanuel Bourg at 2020-07-26T23:02:36+02:00
Build from the api pom instead of the removed root pom
- - - - -
b4496b0a by Emmanuel Bourg at 2020-07-26T23:03:32+02:00
Ignore the glassfish-copyright Maven plugin
- - - - -
a18899bf by Emmanuel Bourg at 2020-07-26T23:03:51+02:00
Upload to unstable
- - - - -
28 changed files:
- .travis.yml
- CONTRIBUTING.md
- api/pom.xml
- api/src/main/java/jakarta/annotation/Generated.java
- api/src/main/java/jakarta/annotation/ManagedBean.java
- api/src/main/java/jakarta/annotation/PostConstruct.java
- api/src/main/java/jakarta/annotation/PreDestroy.java
- api/src/main/java/jakarta/annotation/Priority.java
- api/src/main/java/jakarta/annotation/Resource.java
- api/src/main/java/jakarta/annotation/Resources.java
- api/src/main/java/jakarta/annotation/package-info.java
- api/src/main/java/jakarta/annotation/security/DeclareRoles.java
- api/src/main/java/jakarta/annotation/security/DenyAll.java
- api/src/main/java/jakarta/annotation/security/PermitAll.java
- api/src/main/java/jakarta/annotation/security/RolesAllowed.java
- api/src/main/java/jakarta/annotation/security/RunAs.java
- api/src/main/java/jakarta/annotation/security/package-info.java
- api/src/main/java/jakarta/annotation/sql/DataSourceDefinition.java
- api/src/main/java/jakarta/annotation/sql/DataSourceDefinitions.java
- + api/src/main/java/module-info.java
- api/src/main/javadoc/doc-files/EFSL.html
- debian/changelog
- debian/libjakarta-annotation-api-java.poms
- debian/maven.ignoreRules
- debian/rules
- − pom.xml
- spec/pom.xml
- spec/src/main/asciidoc/annotations-spec.adoc
Changes:
=====================================
.travis.yml
=====================================
@@ -1,16 +1,16 @@
-dist: trusty
+dist: bionic
language: java
sudo: false
jdk:
- - oraclejdk8
- oraclejdk11
- - openjdk8
- 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
=====================================
CONTRIBUTING.md
=====================================
@@ -21,6 +21,21 @@ The project maintains the following source code repositories
* https://github.com/eclipse-ee4j/common-annotations-api
+## Eclipse Development Process
+
+This Eclipse Foundation open project is governed by the Eclipse Foundation
+Development Process and operates under the terms of the Eclipse IP Policy.
+
+The Jakarta EE Specification Committee has adopted the Jakarta EE Specification
+Process (JESP) in accordance with the Eclipse Foundation Specification Process
+v1.2 (EFSP) to ensure that the specification process is complied with by all
+Jakarta EE specification projects.
+
+* https://eclipse.org/projects/dev_process
+* https://www.eclipse.org/org/documents/Eclipse_IP_Policy.pdf
+* https://jakarta.ee/about/jesp/
+* https://www.eclipse.org/legal/efsp_non_assert.php
+
## Eclipse Contributor Agreement
Before your contribution can be accepted by the project team contributors must
=====================================
api/pom.xml
=====================================
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 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
@@ -21,29 +21,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>jakarta.annotation</groupId>
- <artifactId>ca-parent</artifactId>
- <version>2.0.0-RC1</version>
+ <groupId>org.eclipse.ee4j</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0.6</version>
+ <relativePath/>
</parent>
+ <groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
-
- <properties>
- <non.final>false</non.final>
- <spec.version>1.3</spec.version>
- <extension.name>jakarta.annotation</extension.name>
- <vendor.name>Eclipse Foundation</vendor.name>
- <implementation.vendor.id>org.glassfish</implementation.vendor.id>
- <findbugs.version>3.0.5</findbugs.version>
- <findbugs.exclude>exclude.xml</findbugs.exclude>
- <findbugs.threshold>Low</findbugs.threshold>
- </properties>
+ <version>2.0.0</version>
<name>Jakarta Annotations API</name>
<description>Jakarta Annotations API</description>
<url>https://projects.eclipse.org/projects/ee4j.ca</url>
+ <inceptionYear>2004</inceptionYear>
+
<developers>
<developer>
<name>Linda De Michiel</name>
@@ -86,77 +80,124 @@
</mailingList>
</mailingLists>
+ <properties>
+ <copyright.ignoreyear>false</copyright.ignoreyear>
+ <copyright.scmonly>true</copyright.scmonly>
+ <copyright.update>false</copyright.update>
+ <spotbugs.skip>false</spotbugs.skip>
+ <spotbugs.threshold>Low</spotbugs.threshold>
+ <spotbugs.version>4.0.4</spotbugs.version>
+
+ <non.final>false</non.final>
+ <spec.version>2.0</spec.version>
+ <extension.name>jakarta.annotation</extension.name>
+ <vendor.name>Eclipse Foundation</vendor.name>
+ <implementation.vendor.id>org.glassfish</implementation.vendor.id>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.glassfish.copyright</groupId>
+ <artifactId>glassfish-copyright-maven-plugin</artifactId>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>spec-version-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.0</version>
+ <version>5.1.1</version>
+ <configuration>
+ <instructions>
+ <_noextraheaders>true</_noextraheaders>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.5</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.7.1</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.6</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${spotbugs.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0-M3</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[11,)</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.6.0,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.glassfish.copyright</groupId>
+ <artifactId>glassfish-copyright-maven-plugin</artifactId>
+ <configuration>
+ <!-- skip files not under SCM-->
+ <scmOnly>${copyright.scmonly}</scmOnly>
+ <!-- for use with repair -->
+ <update>${copyright.update}</update>
+ <!-- check that year is correct -->
+ <ignoreYear>${copyright.ignoreyear}</ignoreYear>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -183,12 +224,28 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
- <compilerArgument>-Xlint:unchecked</compilerArgument>
+ <release>9</release>
+ <compilerArgs>
+ <arg>-Xlint:all</arg>
+ </compilerArgs>
</configuration>
+ <executions>
+ <execution>
+ <id>base-compile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>8</release>
+ <excludes>
+ <exclude>module-info.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
@@ -222,9 +279,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- </supportedProjectTypes>
<instructions>
<Bundle-Version>${spec.bundle.version}</Bundle-Version>
<Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
@@ -253,12 +307,6 @@
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <!-- for JDK 9 -->
- <Automatic-Module-Name>
- jakarta.annotation
- </Automatic-Module-Name>
- </manifestEntries>
</archive>
</configuration>
</plugin>
@@ -266,86 +314,46 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
- <includePom>true</includePom>
+ <archive>
+ <manifest>
+ <addDefaultEntries>false</addDefaultEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build-Id>${buildNumber}</Implementation-Build-Id>
+ </manifestEntries>
+ </archive>
</configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <source>8</source>
- <doctitle>Jakarta Annotations ${project.version} API Specification</doctitle>
- <sourceFileExcludes>
- <sourceFileExclude>**/module-info.java</sourceFileExclude>
- <sourceFileExclude>target/**/*.java</sourceFileExclude>
- </sourceFileExcludes>
+ <archive>
+ <manifest>
+ <addDefaultEntries>false</addDefaultEntries>
+ </manifest>
+ </archive>
+ <release>11</release>
+ <additionalOptions>--add-modules java.sql</additionalOptions>
+ <notimestamp>true</notimestamp>
<docfilessubdirs>true</docfilessubdirs>
- <links>
- <link>http://docs.oracle.com/javase/8/docs/api/</link>
- </links>
- <detectJavaApiLink>false</detectJavaApiLink>
- <detectOfflineLinks>false</detectOfflineLinks>
- <header><![CDATA[<br>Jakarta Annotations API v${project.version}]]>
- </header>
+ <doctitle>Jakarta Annotations ${project.version} API Specification</doctitle>
+ <header><![CDATA[<br>Jakarta Annotations API v${project.version}]]></header>
<bottom><![CDATA[
- Copyright © 2019 Eclipse Foundation. All rights reserved.<br>
+ Copyright © 2019, 2020 Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license terms</a>.]]>
</bottom>
</configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
- <threshold>${findbugs.threshold}</threshold>
- <excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
- <findbugsXmlOutput>true</findbugsXmlOutput>
+ <skip>${spotbugs.skip}</skip>
+ <threshold>${spotbugs.threshold}</threshold>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <mavenExecutorId>forked-path</mavenExecutorId>
- <useReleaseProfile>false</useReleaseProfile>
- <arguments>${release.arguments}</arguments>
- <tagNameFormat>@{project.version}</tagNameFormat>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs.version}</version>
- <configuration>
- <threshold>${findbugs.threshold}</threshold>
- <excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <fork>true</fork>
</configuration>
</plugin>
</plugins>
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
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
=====================================
api/src/main/java/module-info.java
=====================================
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+
+module jakarta.annotation {
+
+ exports jakarta.annotation;
+ exports jakarta.annotation.security;
+ exports jakarta.annotation.sql;
+
+}
=====================================
api/src/main/javadoc/doc-files/EFSL.html
=====================================
@@ -1,5 +1,23 @@
<html>
<head>
+<!--
+
+ Copyright (c) 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
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
<title>Eclipse Foundation Specification License - v1.0</title>
</head>
<body>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jakarta-annotation-api (2.0.0-1) unstable; urgency=medium
+
+ * New upstream release
+ - Build from the api pom instead of the removed root pom
+ - Ignore the glassfish-copyright Maven plugin
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sun, 26 Jul 2020 23:03:41 +0200
+
jakarta-annotation-api (2.0.0~RC1-1) unstable; urgency=medium
* Initial release (Closes: #963615)
=====================================
debian/libjakarta-annotation-api-java.poms
=====================================
@@ -25,6 +25,5 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-pom.xml --no-parent
-api/pom.xml --java-lib --usj-name=jakarta-annotation-api
+api/pom.xml --no-parent --java-lib --usj-name=jakarta-annotation-api
spec/pom.xml --ignore
=====================================
debian/maven.ignoreRules
=====================================
@@ -6,3 +6,4 @@ org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
org.codehaus.mojo findbugs-maven-plugin * * * *
org.glassfish.build spec-version-maven-plugin * * * *
+org.glassfish.copyright glassfish-copyright-maven-plugin * * * *
=====================================
debian/rules
=====================================
@@ -1,4 +1,16 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --buildsystem=maven
+
+override_dh_auto_build:
+ dh_auto_build -- -f api/pom.xml package -DskipTests
+
+override_dh_auto_test:
+ dh_auto_test -- -f api/pom.xml test
+
+override_dh_auto_install:
+ dh_auto_install -- -f api/pom.xml
+
+override_dh_auto_clean:
+ dh_auto_clean -- -f api/pom.xml
=====================================
pom.xml deleted
=====================================
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2012, 2019 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.ee4j</groupId>
- <artifactId>project</artifactId>
- <version>1.0.6</version>
- </parent>
-
- <groupId>jakarta.annotation</groupId>
- <artifactId>ca-parent</artifactId>
- <packaging>pom</packaging>
- <version>2.0.0-RC1</version>
-
- <inceptionYear>2004</inceptionYear>
-
- <name>Jakarta Annotations Parent POM</name>
- <description>Jakarta Annotations Parent POM</description>
-
- <url>https://projects.eclipse.org/projects/ee4j.ca</url>
-
- <scm>
- <connection>scm:git:https://github.com/eclipse-ee4j/common-annotations-api.git</connection>
- <developerConnection>scm:git:git at github.com:eclipse-ee4j/common-annotations-api.git</developerConnection>
- <url>https://github.com/eclipse-ee4j/common-annotations-api</url>
- <tag>HEAD</tag>
- </scm>
-
- <properties>
- <non.final>false</non.final>
- <spec.version>1.3</spec.version>
- <extension.name>jakarta.annotation</extension.name>
- <vendor.name>Oracle Corporation</vendor.name>
- <implementation.vendor.id>org.glassfish</implementation.vendor.id>
- <findbugs.version>3.0.5</findbugs.version>
- <findbugs.exclude>exclude.xml</findbugs.exclude>
- <findbugs.threshold>Low</findbugs.threshold>
- </properties>
-
- <modules>
- <module>api</module>
- <module>spec</module>
- </modules>
-
- <licenses>
- <license>
- <name>EPL 2.0</name>
- <url>http://www.eclipse.org/legal/epl-2.0</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>GPL2 w/ CPE</name>
- <url>https://www.gnu.org/software/classpath/license.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-</project>
=====================================
spec/pom.xml
=====================================
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2019 Contributors to the Eclipse Foundation.
+ Copyright (c) 2019, 2020 Contributors to the Eclipse Foundation.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,16 +16,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
+
<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">
<parent>
- <groupId>jakarta.annotation</groupId>
- <artifactId>ca-parent</artifactId>
- <version>2.0.0-RC1</version>
+ <groupId>org.eclipse.ee4j</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0.6</version>
+ <relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>annotations-spec</artifactId>
- <version>2.0.0-RC1</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jakarta Annotations Specification</name>
@@ -36,10 +38,8 @@
<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
- <asciidoctor.maven.plugin.version>1.5.7.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.version>1.6.2</asciidoctorj.version>
- <asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
- <jruby.version>9.2.6.0</jruby.version>
+ <asciidoctor.maven.plugin.version>2.0.0</asciidoctor.maven.plugin.version>
+ <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -75,16 +75,6 @@
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.maven.plugin.version}</version>
<dependencies>
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>${jruby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>${asciidoctorj.version}</version>
- </dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
@@ -178,7 +168,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.3.0</version>
<inherited>false</inherited>
<executions>
<execution>
=====================================
spec/src/main/asciidoc/annotations-spec.adoc
=====================================
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2017, 2019 Contributors to the Eclipse Foundation
+// Copyright (c) 2017, 2020 Contributors to the Eclipse Foundation
//
= Jakarta Annotations
@@ -16,7 +16,7 @@
ifdef::backend-pdf[]
:pagenums:
:numbered:
-:title-logo-image: image:jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right]
+:title-logo-image: image:images/jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right]
endif::[]
// == License
View it on GitLab: https://salsa.debian.org/java-team/jakarta-annotation-api/-/compare/fd1f9fd5d8bb310d741abed23f375cc706eb8cd2...a18899bf39bb5dea05aba369685f0afbcab1205c
--
View it on GitLab: https://salsa.debian.org/java-team/jakarta-annotation-api/-/compare/fd1f9fd5d8bb310d741abed23f375cc706eb8cd2...a18899bf39bb5dea05aba369685f0afbcab1205c
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/20200726/e252210c/attachment.html>
More information about the pkg-java-commits
mailing list