Skip to content

Commit

Permalink
Merge pull request #104 from rgrashel/1.6.0-JakartaEE10
Browse files Browse the repository at this point in the history
* Initial Jakarta EE 10 Conversion on Java 11.
  • Loading branch information
rgrashel authored Nov 27, 2023
2 parents 3a3bfc8 + ac3801a commit 6239be3
Show file tree
Hide file tree
Showing 349 changed files with 39,685 additions and 38,543 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

on:
push:
branches: [ "**" ]
pull_request:
branches: [ "**" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Checkout source code
uses: actions/checkout@v4
- name: Set up JDK 11 on Temurin
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml

# Commented this out because it breaks the build (for now)
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
#- name: Update dependency graph
# uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
6 changes: 0 additions & 6 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion dist/distribution-assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependencySet>
<scope>provided</scope>
<includes>
<include>servlets.com:cos</include>
<include>org.apache.commons.fileupload2:commons-fileupload2-jakarta</include>
</includes>
</dependencySet>
<dependencySet>
Expand Down
2 changes: 1 addition & 1 deletion dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes-parent</artifactId>
<version>1.6.0</version>
<version>1.6.0-JakartaEE10</version>
<relativePath>..</relativePath>
</parent>
<artifactId>stripes-dist</artifactId>
Expand Down
78 changes: 0 additions & 78 deletions dist/src/assembly/lib/cos.license

This file was deleted.

Loading

0 comments on commit 6239be3

Please sign in to comment.