Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drop parent pom, #76

Merged
merged 1 commit into from Jul 16, 2020
Merged

drop parent pom, #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
View file
Open in desktop
@@ -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
- mvn -f api/pom.xml verify -B -V
219 changes: 107 additions & 112 deletions api/pom.xml
View file
Open in desktop
@@ -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
Expand All @@ -21,29 +21,23 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.annotation</groupId>
<artifactId>ca-parent</artifactId>
<version>2.0-SNAPSHOT</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-SNAPSHOT</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>
Expand Down Expand Up @@ -86,38 +80,58 @@
</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.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.1</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.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -126,37 +140,64 @@
<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>
Expand Down Expand Up @@ -238,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>
Expand Down Expand Up @@ -276,89 +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>
<additionalOptions>
<additionalOption>--frames</additionalOption>
</additionalOptions>
<sourceFileExcludes>
<sourceFileExclude>module-info.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 &#169; 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>
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/annotation/Generated.java
View file
Open in desktop
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/annotation/ManagedBean.java
View file
Open in desktop
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/annotation/PostConstruct.java
View file
Open in desktop
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/annotation/PreDestroy.java
View file
Open in desktop
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/annotation/Priority.java
View file
Open in desktop
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/annotation/Resource.java
View file
Open in desktop
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/annotation/Resources.java
View file
Open in desktop
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/annotation/package-info.java
View file
Open in desktop
@@ -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
Expand Down