Skip to content

Commit

Permalink
Bump assertj-parent-pom from 2.2.10 to 2.2.14, POM cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
scordio committed Sep 15, 2024
1 parent fa8d8af commit 44dbbe2
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 68 deletions.
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ updates:
directory: "/"
schedule:
interval: "daily"
time: "02:00"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
time: "02:00"
38 changes: 0 additions & 38 deletions .github/workflows/build.yml

This file was deleted.

49 changes: 49 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -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 }}
38 changes: 10 additions & 28 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.assertj</groupId>
<artifactId>assertj-parent-pom</artifactId>
<version>2.2.10</version>
<version>2.2.14</version>
</parent>

<artifactId>assertj-assertions-generator</artifactId>
<version>2.2.2-SNAPSHOT</version>

<name>AssertJ Assertions Generator</name>

<scm>
Expand All @@ -18,6 +20,12 @@
<tag>HEAD</tag>
</scm>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -71,31 +79,6 @@
<build>
<finalName>assertion-generator</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- needed to fix javadoc on java 11+ https://github.com/joel-costigliola/assertj-core/issues/1403 -->
<source>8</source>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down Expand Up @@ -131,7 +114,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<manifest>
Expand Down

0 comments on commit 44dbbe2

Please sign in to comment.