diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f8414ae4..b76b8957 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,9 +4,7 @@ updates: directory: "/" schedule: interval: "daily" - time: "02:00" - package-ecosystem: "github-actions" directory: "/" schedule: interval: "daily" - time: "02:00" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 4630fcf1..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: CI - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - build: - - runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }} - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Cache Maven Repository - uses: actions/cache@v2 - with: - path: ~/.m2 - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-maven - - name: Test with Sonar - run: > - ./mvnw -V --no-transfer-progress -e clean verify javadoc:javadoc - org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar - -Dsonar.host.url=https://sonarcloud.io - -Dsonar.organization=assertj - -Dsonar.projectKey=assertj_assertj-assertions-generator - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..a1e132ed --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,49 @@ +name: CI + +on: [push, pull_request] + +env: + MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always + +jobs: + + test: + + name: Test + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: '1.8' + cache: 'maven' + - name: Test + run: ./mvnw $MAVEN_ARGS verify + + sonar: + + name: Sonar code analysis + runs-on: ubuntu-latest + if: github.repository == 'assertj/assertj-assertions-generator' && github.event_name == 'push' + + steps: + - uses: actions/checkout@v4 + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: '1.8' + cache: 'maven' + - name: Test with Sonar + run: > + ./mvnw -V --no-transfer-progress -e clean verify javadoc:javadoc + org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar + -Dsonar.host.url=https://sonarcloud.io + -Dsonar.organization=assertj + -Dsonar.projectKey=assertj_assertj-assertions-generator + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/pom.xml b/pom.xml index b39bee35..a9e6bc93 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,16 @@ - 4.0.0 + org.assertj assertj-parent-pom - 2.2.10 + 2.2.14 + assertj-assertions-generator 2.2.2-SNAPSHOT + AssertJ Assertions Generator @@ -18,6 +20,12 @@ HEAD + + 1.8 + 1.8 + UTF-8 + + org.apache.commons @@ -71,31 +79,6 @@ assertion-generator - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - 8 - - - - attach-javadocs - - jar - - - - org.apache.maven.plugins maven-assembly-plugin @@ -131,7 +114,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0