Skip to content

Commit 45489c1

Browse files
jjlauerjjlauer
authored
Feature/java21 (#757)
* 2023-12-07 Full support for Java 21 (compiling, testing, etc.) (jjlauer) * 2023-12-07 Updated Jetty dependency to v9.4.53.v20231009 (jjlauer) * 2023-12-07 Github workflow automated CI for Java 8, 11, 17, and 21 (jjlauer) * 2023-12-07 Updated Mockito dependency for testing to v4.11.0 for Java 8, v5.4.0 for Java 9+ (jjlauer) * 2023-12-07 Improved 'mvn test' speed by roughly 100% through optimizing several unit tests (jjlauer) * 2023-12-07 Removed PowerMock dependency for testing (its old, no longer supported) (jjlauer) * 2023-12-07 Added maven central and CI badges to README (jjlauer)
1 parent e5f1945 commit 45489c1

File tree

81 files changed

+364
-339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+364
-339
lines changed

‎.github/workflows/java11.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Java 11
2+
on:
3+
- push
4+
- workflow_dispatch
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
timeout-minutes: 10
9+
steps:
10+
- uses: actions/checkout@v3
11+
- name: Set up Azul JDK 11
12+
uses: actions/setup-java@v3
13+
with:
14+
java-version: 11
15+
distribution: 'zulu'
16+
cache: 'maven'
17+
- name: Test in Maven
18+
run: mvn test

‎.github/workflows/java17.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Java 17
2+
on:
3+
- push
4+
- workflow_dispatch
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
timeout-minutes: 10
9+
steps:
10+
- uses: actions/checkout@v3
11+
- name: Set up Azul JDK 17
12+
uses: actions/setup-java@v3
13+
with:
14+
java-version: 17
15+
distribution: 'zulu'
16+
cache: 'maven'
17+
- name: Test in Maven
18+
run: mvn test

‎.github/workflows/java21.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Java 21
2+
on:
3+
- push
4+
- workflow_dispatch
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
timeout-minutes: 10
9+
steps:
10+
- uses: actions/checkout@v3
11+
- name: Set up Azul JDK 21
12+
uses: actions/setup-java@v3
13+
with:
14+
java-version: 21
15+
distribution: 'zulu'
16+
cache: 'maven'
17+
- name: Test in Maven
18+
run: mvn test

‎.github/workflows/java8.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Java 8
2+
on:
3+
- push
4+
- workflow_dispatch
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
timeout-minutes: 10
9+
steps:
10+
- uses: actions/checkout@v3
11+
- name: Set up Azul JDK 8
12+
uses: actions/setup-java@v3
13+
with:
14+
java-version: 8
15+
distribution: 'zulu'
16+
cache: 'maven'
17+
- name: Test in Maven
18+
run: mvn test

‎.github/workflows/maven.yml‎

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

‎README.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,17 @@
44
/ | \ / | \/\__| / | \
55
\____|__ /___\____|__ /\________\____|__ /
66
web\/framework \/ \/
7-
8-
97

108
Ninja - web framework
119
=====================
1210

11+
[![Maven Central](https://img.shields.io/maven-central/v/org.ninjaframework/ninja?color=blue&style=flat-square)](https://mvnrepository.com/artifact/org.ninjaframework/ninja)
12+
13+
[![Java 8](https://img.shields.io/github/actions/workflow/status/ninjaframework/ninja/java8.yaml?branch=develop&label=Java%208&style=flat-square)](https://github.com/ninjaframework/ninja/actions/workflows/java11.yaml)
14+
[![Java 11](https://img.shields.io/github/actions/workflow/status/ninjaframework/ninja/java11.yaml?branch=develop&label=Java%2011&style=flat-square)](https://github.com/ninjaframework/ninja/actions/workflows/java11.yaml)
15+
[![Java 17](https://img.shields.io/github/actions/workflow/status/ninjaframework/ninja/java17.yaml?branch=develop&label=Java%2017&style=flat-square)](https://github.com/ninjaframework/ninja/actions/workflows/java17.yaml)
16+
[![Java 19](https://img.shields.io/github/actions/workflow/status/ninjaframework/ninja/java21.yaml?branch=develop&label=Java%2021&style=flat-square)](https://github.com/ninjaframework/ninja/actions/workflows/java21.yaml)
17+
1318
Ninja is a full stack web framework for Java.
1419
Rock solid, fast and super productive.
1520

‎ninja-core/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.ninjaframework</groupId>
2727
<artifactId>ninja</artifactId>
28-
<version>6.9.1-SNAPSHOT</version>
28+
<version>7.0.0-SNAPSHOT</version>
2929
</parent>
3030

3131
<organization>
@@ -263,15 +263,15 @@
263263
<artifactId>mockito-core</artifactId>
264264
</dependency>
265265

266-
<dependency>
266+
<!--<dependency>
267267
<groupId>org.powermock</groupId>
268268
<artifactId>powermock-module-junit4</artifactId>
269269
</dependency>
270270
271271
<dependency>
272272
<groupId>org.powermock</groupId>
273273
<artifactId>powermock-api-mockito2</artifactId>
274-
</dependency>
274+
</dependency>-->
275275

276276
<!-- Jaxb was removed from Java 9 and onwards. So we add the dependency explicitly -->
277277
<dependency>

‎ninja-core/src/site/markdown/developer/changelog.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 7.x.x
2+
=============
3+
4+
* 2023-12-07 Full support for Java 21 (compiling, testing, etc.) (jjlauer)
5+
* 2023-12-07 Updated Jetty dependency to v9.4.53.v20231009 (jjlauer)
6+
* 2023-12-07 Github workflow automated CI for Java 8, 11, 17, and 21 (jjlauer)
7+
* 2023-12-07 Updated Mockito dependency for testing to v4.11.0 for Java 8, v5.4.0 for Java 9+ (jjlauer)
8+
* 2023-12-07 Improved 'mvn test' speed by roughly 100% through optimizing several unit tests (jjlauer)
9+
* 2023-12-07 Removed PowerMock dependency for testing (its old, no longer supported) (jjlauer)
10+
* 2023-12-07 Added maven central and CI badges to README (jjlauer)
11+
112
Version 6.9.0
213
=============
314

‎ninja-core/src/test/java/ninja/AssetsControllerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.mockito.Captor;
2828
import org.mockito.Mock;
2929
import org.mockito.Mockito;
30-
import org.mockito.runners.MockitoJUnitRunner;
30+
import org.mockito.junit.MockitoJUnitRunner;
3131

3232
import java.io.ByteArrayOutputStream;
3333

‎ninja-core/src/test/java/ninja/AuthenticityFilterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.junit.runner.RunWith;
2626
import org.mockito.Mock;
2727
import org.mockito.Mockito;
28-
import org.mockito.runners.MockitoJUnitRunner;
28+
import org.mockito.junit.MockitoJUnitRunner;
2929

3030
@RunWith(MockitoJUnitRunner.class)
3131
public class AuthenticityFilterTest {

0 commit comments

Comments
 (0)