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

integrate activation-api 2.1.3 #706

Merged
merged 4 commits into from
Feb 15, 2024
Merged

integrate activation-api 2.1.3 #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db1586d
Integrate activation-api 2.1.3,
lukasj Feb 15, 2024
8d3ed35
update build plugins
lukasj Feb 15, 2024
2530886
allow reproducible build
lukasj Feb 15, 2024
f90cd1f
update gh action build
lukasj Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
# Copyright (c) 2021, 2024 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
Expand Down Expand Up @@ -29,22 +29,17 @@ jobs:

strategy:
matrix:
java_version: [ 11, 17 ]
java_version: [ 11, 17, 21 ]

steps:
- name: Checkout for build
uses: actions/checkout@v2.3.4
uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: ${{ matrix.java_version }}
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
cache: 'maven'
- name: Verify
run: |
cd api
Expand Down
27 changes: 14 additions & 13 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--

Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2024 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 @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
<version>1.0.9</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -66,6 +66,7 @@
<properties>
<spec.version>2.1</spec.version>
<spec.title>Jakarta Mail Specification</spec.title>
<project.build.outputTimestamp>2024-02-14T00:00:00Z</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javadoc.title>Jakarta Mail API documentation</javadoc.title>
<legal.doc.source>${project.basedir}/..</legal.doc.source>
Expand All @@ -78,7 +79,7 @@
<spotbugs.threshold>Low</spotbugs.threshold>
<spotbugs.exclude>${project.basedir}/../spotbugs-exclude.xml</spotbugs.exclude>
<!--Maven plugins version-->
<spotbugs.version>4.7.3.4</spotbugs.version>
<spotbugs.version>4.8.3.1</spotbugs.version>

<!-- version identifier in jakarta.mail.Version -->
<mail.version>${project.version}</mail.version>
Expand All @@ -89,12 +90,12 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.2</version>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -132,12 +133,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -147,7 +148,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
Expand All @@ -163,7 +164,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -173,7 +174,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.8</version>
<version>5.1.9</version>
<configuration>
<instructions>
<_noextraheaders>true</_noextraheaders>
Expand All @@ -188,12 +189,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.3</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.glassfish.copyright</groupId>
Expand Down Expand Up @@ -469,7 +470,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<version>0.8.11</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down