Skip to content

Commit

Permalink
merge changes
Browse files Browse the repository at this point in the history
  • Loading branch information
loulou2u committed Jan 19, 2023
2 parents b70decb + b94c0ec commit cfcfc2a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ on:

jobs:
test:
name: '${{ matrix.platform }} with Java 8'
name: '${{ matrix.platform }} with Java ${{ matrix.java-version }}'
strategy:
matrix:
platform:
- ubuntu-latest
- windows-latest
- macos-latest
java-version:
- 8
- 11
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout
Expand All @@ -24,6 +27,6 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: adopt-hotspot
java-version: 8
java-version: ${{ matrix.java-version }}
- name: Test
run: ./gradlew check -S --no-daemon --no-parallel
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ servletApiVersion=2.5
slf4jVersion=1.7.36
springfoxVersion=2.9.2
uPortalVersion=5.13.1
annotationApiVersion=1.3.2
jaxbApiVersion=2.3.1

# Portlet API Dependency
portletApiDependency=org.apache.portals:portlet-api_2.1.0_spec:1.0
Expand Down
2 changes: 2 additions & 0 deletions notification-portlet-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
compile "commons-lang:commons-lang:${commonsLangVersion}"
compile "org.slf4j:slf4j-api:${slf4jVersion}"
compile "javax.annotation:javax.annotation-api:${annotationApiVersion}"
compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
compileOnly "org.projectlombok:lombok:${lombokVersion}"
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
compileOnly "${portletApiDependency}"
Expand Down
2 changes: 2 additions & 0 deletions notification-portlet-webapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ dependencies {
compile "com.rometools:rome:${romeVersion}"
compileOnly "org.projectlombok:lombok:${lombokVersion}"
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
compile "javax.annotation:javax.annotation-api:${annotationApiVersion}"
compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"

/*
* Spring Boot
Expand Down

0 comments on commit cfcfc2a

Please sign in to comment.