Skip to content

Commit fad08c4

Browse files
committed
Bump assertj-parent-pom from 2.2.10 to 2.2.14, POM cleanup
1 parent fa8d8af commit fad08c4

File tree

4 files changed

+59
-68
lines changed

4 files changed

+59
-68
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7-
time: "02:00"
87
- package-ecosystem: "github-actions"
98
directory: "/"
109
schedule:
1110
interval: "daily"
12-
time: "02:00"

.github/workflows/build.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always
7+
8+
jobs:
9+
10+
test:
11+
12+
name: Test
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
- name: Set up Java
18+
uses: actions/setup-java@v4
19+
with:
20+
distribution: 'zulu'
21+
java-version: '8'
22+
cache: 'maven'
23+
- name: Test
24+
run: ./mvnw $MAVEN_ARGS verify
25+
26+
sonar:
27+
28+
name: Sonar code analysis
29+
runs-on: ubuntu-latest
30+
if: github.repository == 'assertj/assertj-assertions-generator' && github.event_name == 'push'
31+
32+
steps:
33+
- uses: actions/checkout@v4
34+
- name: Set up Java
35+
uses: actions/setup-java@v4
36+
with:
37+
distribution: 'zulu'
38+
java-version: '8'
39+
cache: 'maven'
40+
- name: Test with Sonar
41+
run: >
42+
./mvnw -V --no-transfer-progress -e clean verify javadoc:javadoc
43+
org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar
44+
-Dsonar.host.url=https://sonarcloud.io
45+
-Dsonar.organization=assertj
46+
-Dsonar.projectKey=assertj_assertj-assertions-generator
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

pom.xml

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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 ">
3-
43
<modelVersion>4.0.0</modelVersion>
4+
55
<parent>
66
<groupId>org.assertj</groupId>
77
<artifactId>assertj-parent-pom</artifactId>
8-
<version>2.2.10</version>
8+
<version>2.2.14</version>
99
</parent>
10+
1011
<artifactId>assertj-assertions-generator</artifactId>
1112
<version>2.2.2-SNAPSHOT</version>
13+
1214
<name>AssertJ Assertions Generator</name>
1315

1416
<scm>
@@ -18,6 +20,12 @@
1820
<tag>HEAD</tag>
1921
</scm>
2022

23+
<properties>
24+
<maven.compiler.source>1.8</maven.compiler.source>
25+
<maven.compiler.target>1.8</maven.compiler.target>
26+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
27+
</properties>
28+
2129
<dependencies>
2230
<dependency>
2331
<groupId>org.apache.commons</groupId>
@@ -71,31 +79,6 @@
7179
<build>
7280
<finalName>assertion-generator</finalName>
7381
<plugins>
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-compiler-plugin</artifactId>
77-
<configuration>
78-
<source>1.8</source>
79-
<target>1.8</target>
80-
<encoding>${project.build.sourceEncoding}</encoding>
81-
</configuration>
82-
</plugin>
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-javadoc-plugin</artifactId>
86-
<configuration>
87-
<!-- needed to fix javadoc on java 11+ https://github.com/joel-costigliola/assertj-core/issues/1403 -->
88-
<source>8</source>
89-
</configuration>
90-
<executions>
91-
<execution>
92-
<id>attach-javadocs</id>
93-
<goals>
94-
<goal>jar</goal>
95-
</goals>
96-
</execution>
97-
</executions>
98-
</plugin>
9982
<plugin>
10083
<groupId>org.apache.maven.plugins</groupId>
10184
<artifactId>maven-assembly-plugin</artifactId>
@@ -131,7 +114,6 @@
131114
<plugin>
132115
<groupId>org.apache.maven.plugins</groupId>
133116
<artifactId>maven-jar-plugin</artifactId>
134-
<version>3.2.0</version>
135117
<configuration>
136118
<archive>
137119
<manifest>

0 commit comments

Comments
 (0)