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

add proper JPMS descriptor, upgrade build plugins #72

Merged
merged 2 commits into from Feb 7, 2020
Merged

add proper JPMS descriptor, upgrade build plugins #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81828eb
add proper JPMS descriptor, upgrade build plugins
lukasj Feb 7, 2020
e21e83c
drop build on JDK 8
lukasj Feb 7, 2020
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
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -3,9 +3,7 @@ language: java
sudo: false

jdk:
- oraclejdk8
- oraclejdk11
- openjdk8
- openjdk11

cache:
Expand Down
45 changes: 29 additions & 16 deletions api/pom.xml
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
Expand All @@ -106,12 +106,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.0</version>
<version>4.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -121,7 +121,7 @@
<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>
Expand Down Expand Up @@ -183,12 +183,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>
Expand Down Expand Up @@ -253,12 +269,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>
Expand All @@ -283,10 +293,13 @@
<configuration>
<source>8</source>
<doctitle>Jakarta Annotations ${project.version} API Specification</doctitle>
<additionalOptions>
<additionalOption>--frames</additionalOption>
</additionalOptions>
<sourceFileExcludes>
<sourceFileExclude>**/module-info.java</sourceFileExclude>
<sourceFileExclude>target/**/*.java</sourceFileExclude>
<sourceFileExclude>module-info.java</sourceFileExclude>
</sourceFileExcludes>
<notimestamp>true</notimestamp>
<docfilessubdirs>true</docfilessubdirs>
<links>
<link>http://docs.oracle.com/javase/8/docs/api/</link>
Expand All @@ -296,7 +309,7 @@
<header><![CDATA[<br>Jakarta Annotations API v${project.version}]]>
</header>
<bottom><![CDATA[
Copyright &#169; 2019 Eclipse Foundation. All rights reserved.<br>
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>
Expand Down
24 changes: 24 additions & 0 deletions api/src/main/java/module-info.java
View file
Open in desktop
@@ -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;

}