Skip to content

Commit b542dc2

Browse files
authored
Merge pull request #559 from TheSnoozer/breaking-changes
Drop support for Java 8, Java 9 and Java 10 + Drop Maven 3.0.x
2 parents 8a73ae9 + 4c5f15f commit b542dc2

File tree

5 files changed

+37
-18
lines changed

5 files changed

+37
-18
lines changed

.github/workflows/default-tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2
11-
- name: Set up JDK 8
11+
- name: Set up JDK 11
1212
uses: actions/setup-java@v2
1313
with:
1414
distribution: 'zulu'
15-
java-version: 8
15+
java-version: 11
1616
java-package: jdk
1717
- name: Cache local Maven repository
1818
uses: actions/cache@v2
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
matrix:
3232
java_allow_illegal_access: [false]
33-
java_version: ['8', '9', '10', '11', '12', '13', '14', '15']
33+
java_version: ['11', '12', '13', '14', '15']
3434
include:
3535
- java_version: '16'
3636
java_allow_illegal_access: true
@@ -64,8 +64,8 @@ jobs:
6464
needs: checkstyle
6565
strategy:
6666
matrix:
67-
java_version: ['8']
68-
maven_version: ['3.0', '3.0.5', '3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.1']
67+
java_version: ['11']
68+
maven_version: ['3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.1']
6969

7070
steps:
7171
- uses: actions/checkout@v2
@@ -119,11 +119,11 @@ jobs:
119119
steps:
120120
- uses: actions/checkout@v2
121121
- run: git checkout "${GITHUB_REF:11}"
122-
- name: Set up JDK 8
122+
- name: Set up JDK 11
123123
uses: actions/setup-java@v2
124124
with:
125125
distribution: 'zulu'
126-
java-version: 8
126+
java-version: 11
127127
java-package: jdk
128128
- name: Cache local Maven repository
129129
uses: actions/cache@v2
@@ -142,11 +142,11 @@ jobs:
142142

143143
steps:
144144
- uses: actions/checkout@v2
145-
- name: Set up JDK 8
145+
- name: Set up JDK 11
146146
uses: actions/setup-java@v2
147147
with:
148148
distribution: 'zulu'
149-
java-version: 8
149+
java-version: 11
150150
java-package: jdk
151151
- name: Cache local Maven repository
152152
uses: actions/cache@v2

README.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Plugin compatibility with Java
4444
| 2.2.X | Java 1.7 |
4545
| 3.0.0 | Java 1.8 |
4646
| 4.0.0 | Java 1.8 |
47+
| 5.0.0 | Java 11 |
4748

4849

4950
Plugin compatibility with Maven
@@ -52,19 +53,28 @@ Even though this plugin tries to be compatible with every Maven version there ar
5253

5354
| Maven Version | Plugin Version | Notes |
5455
| --------------------------- | ---------------:|:---------------------------------------------------------------------------------------------------------------:|
55-
| Maven 2.0.11 | up to 2.2.6 | Maven 2 is EOL, git-commit-id-plugin:1.0 doesn't work -- requires maven version 2.2.1 |
56-
| Maven 2.2.1 | up to 2.2.6 | Maven 2 is EOL |
57-
| Maven 3.0.X | any | git-commit-id-plugin:2.1.14, 2.1.15, 2.2.0, 2.2.1, 2.2.3 doesn't work -- requires maven version 3.1.1 |
58-
| Maven 3.0.X | any | For git-commit-id-plugin 2.2.4 or higher: works, but failed to load class "org.slf4j.impl.StaticLoggerBinder" |
5956
| Maven 3.1.0 | any | git-commit-id-plugin:2.1.14, 2.1.15, 2.2.0, 2.2.1, 2.2.3 doesn't work -- requires maven version 3.1.1 |
6057
| Maven 3.3.1 | any | git-commit-id-plugin:2.1.14 doesn't work |
6158
| Maven 3.3.3 | any | git-commit-id-plugin:2.1.14 doesn't work |
62-
| Maven 3.X.X | any | Any other non listed version here should work with any plugin version |
59+
| Maven 3.X.X (3.0.X is EOL) | any | Any other non listed version here should work with any plugin version |
6360

6461

6562
Note:
6663
As an example -- this table should be read as: For `Maven 3.1.0` `any` Plugin Version should work, besides the ones listed in the `Notes` have the limitations listed.
6764

65+
Plugin compatibility with EOL Maven version
66+
-----------------------------
67+
End of life (EOL) Maven versions are no longer supported by Maven, nor this plugin.
68+
The following information is made available for reference.
69+
70+
| Maven Version | Plugin Version | Notes |
71+
| --------------------------- | ---------------:|:---------------------------------------------------------------------------------------------------------------:|
72+
| Maven 2.0.11 | up to 2.2.6 | Maven 2 is EOL, git-commit-id-plugin:1.0 doesn't work -- requires maven version 2.2.1 |
73+
| Maven 2.2.1 | up to 2.2.6 | Maven 2 is EOL |
74+
| Maven 3.0.X | up to 4.0.5 | git-commit-id-plugin:2.1.14, 2.1.15, 2.2.0, 2.2.1, 2.2.3 doesn't work -- requires maven version 3.1.1 |
75+
| Maven 3.0.X | up to 4.0.5 | For git-commit-id-plugin 2.2.4 or higher: works, but failed to load class "org.slf4j.impl.StaticLoggerBinder" |
76+
77+
6878
Getting SNAPSHOT versions of the plugin
6979
---------------------------------------
7080
If you really want to use **snapshots**, here's the repository they are deployed to.

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18-
<java.target>1.8</java.target>
18+
<java.target>11</java.target>
1919

2020
<jgit.version>5.12.0.202106070339-r</jgit.version>
2121
<junit.version>4.13.2</junit.version>

maven/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2828
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2929

30-
<java.target>1.8</java.target>
30+
<java.target>11</java.target>
3131

32-
<maven-plugin-api.version>3.0</maven-plugin-api.version>
32+
<maven-plugin-api.version>3.1.0-alpha-1</maven-plugin-api.version>
3333
<maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
3434

3535
<junit.version>4.13.2</junit.version>

pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4444

45-
<java.target>1.8</java.target>
45+
<java.target>11</java.target>
4646
</properties>
4747

4848
<modules>
@@ -152,8 +152,17 @@
152152
<groupId>org.apache.maven.plugins</groupId>
153153
<artifactId>maven-javadoc-plugin</artifactId>
154154
<configuration>
155+
<detectJavaApiLink>false</detectJavaApiLink>
155156
<source>8</source>
156157
</configuration>
158+
<executions>
159+
<execution>
160+
<id>attach-javadocs</id>
161+
<goals>
162+
<goal>jar</goal>
163+
</goals>
164+
</execution>
165+
</executions>
157166
</plugin>
158167
</plugins>
159168
</build>

0 commit comments

Comments
 (0)