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.

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

Update pom.xml with new plugin, setting #15590

Merged
merged 2 commits into from
May 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 8 additions & 12 deletions .github/workflows/check-supported-versions.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
name: Check Supported Java Versions
name: Linux tests

on:
push:
branches:
- master
- '[5-9]+.[0-9]+.x'
pull_request:
branches:
- master
- '[5-9]+.[0-9]+.x'

jobs:
build:
Expand All @@ -12,13 +18,6 @@ jobs:
matrix:
java: [11, 17]
os: [ubuntu-latest]
include:
- java: 11
os: windows-latest
- java: 17
os: ubuntu-latest
# Need to update to Gradle version with v17 support in modules/openapi-generator-gradle-plugin/pom.xml
flags: -am -pl modules/openapi-generator-cli -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down Expand Up @@ -47,7 +46,7 @@ jobs:
- name: Build with Maven
shell: bash
run: mvn -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress clean install --file pom.xml ${{ matrix.flags }}
run: mvn -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress clean install --file pom.xml
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

Expand Down Expand Up @@ -78,9 +77,6 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
# include:
# - os: windows-latest
# flags: --skip-docs
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand All @@ -294,7 +294,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>1.8.0</version>
<version>1.11.0</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.2.5</version>
Expand All @@ -314,7 +314,7 @@
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
<version>2.6</version>
<version>3.5.1</version>
<configuration>
<bundledSignatures>
<!--
Expand Down