Skip to content

Commit

Permalink
Java 17 (#689)
Browse files Browse the repository at this point in the history
* Java 17 changes.

* Few more documentation fixes and Java 17 references. Also added .java-version for those who use it.
  • Loading branch information
bodiam authored Feb 11, 2023
1 parent 3d6315d commit f1a3e50
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'temurin'
cache: maven
server-id: ossrh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build:
strategy:
matrix:
java-version: [ 8, 11, 17, 19 ]
java-version: [ 17, 19 ]
runs-on: [ ubuntu-latest, macos-latest, windows-latest ]
name: Jdk ${{ matrix.java-version }}, os ${{ matrix.runs-on }}
runs-on: ${{ matrix.runs-on }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'temurin'
cache: maven
server-id: ossrh
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ target
!.idea/vcs.xml
!.idea/icon.png
*.iml
.java-version
/dependency-reduced-pom.xml
META-INF/
bin/
Expand Down
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17
7 changes: 2 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ First and foremost thanks to anyone who contributes, very much appreciated.
- Submit a PR with your change and if there are no comments, changes will be merged in.
- If you're not sure about the change, raise an issue and have a discussion before spending time coding it up.
- Try and make one logical change per PR. That is not make many changes in one PR. Submit multiple PRs instead.
- Java 8 is our target version. If you need anything older than that, we recommend using [Java Faker](https://github.com/DiUS/java-faker) instead.
- Starting with Datafaker 2.x, Java 17 is our target version. If you need anything older than that, we recommend using the 1.x versions of Datafaker instead. Note that while the 1.x is stable and free of known bugs, this branch won't receive future updates.

## Building

- Should be as easy as running `mvn clean install` on the root directory.
- When you do not have [GnuPG](https://gnupg.org/) in your path, and you cannot install it, to be able to build without error you may
- specify the property `gpg.skip=true` when running maven, for example `mvn clean install '-Dgpg.skip=true'`.
- use the profile `noGpg`, for example `mvn clean install -PnoGpg`
- Should be as easy as running `mvnw clean install` on the root directory.
13 changes: 7 additions & 6 deletions docs/documentation/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ First and foremost thanks to anyone who contributes, very much appreciated.

## Guidelines

- If you add new faker classes like `Address`, `Country`, and `Number` they should be accompanied by a unit test. Where relevant please add more assertions to the `net.datafaker.FakerIT` class.
- If you add new faker classes like `Address`, `Country`, and `Number` they should be accompanied by a unit test.
- New faker classes should be placed in the relevant group of providers. For example: `Minecraft` class will be in the `videogame` group, `Address` in the `base` group.
- If you add a new faker class, update the `README.md`.
- Submit a PR with your change and if there are no comments, changes will be merged in
- If you're not sure about the change, raise an issue and have a discussion before spending time coding it up
- Try and make one logical change per PR. That is not make many changes in one PR. Submit multiple PRs instead
- Since Datafaker 2.x, Java 17 is our target version. If you need anything older than that, we recommend using the 1.x versions of Datafaker instead. Note that while the 1.x is stable and free of known bugs, this branch won't receive future updates.
- Submit a PR with your change and if there are no comments, changes will be merged in.
- If you're not sure about the change, raise an issue and have a discussion before spending time coding it up.
- Try and make one logical change per PR. That is not make many changes in one PR. Submit multiple PRs instead.
- Starting with Datafaker 2.x, Java 17 is our target version. If you need anything older than that, we recommend using the 1.x versions of Datafaker instead. Note that while the 1.x is stable and free of known bugs, this branch won't receive future updates.

## Building

- Should be as easy as running `mvn clean install` on the root directory
- Should be as easy as running `mvnw clean install` on the root directory.
1 change: 0 additions & 1 deletion docs/releases/1.8.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ your amazing work!
* Remove usage Format Json from BaseFaker by @RVRhub in https://github.com/datafaker-net/datafaker/pull/663
* Include XML files in .gitattributes as text by @kingthorin in https://github.com/datafaker-net/datafaker/pull/664
* Add computer brands by @kingthorin in https://github.com/datafaker-net/datafaker/pull/665
* implement currently passing Xlint checks by @kingthorin in https://github.com/datafaker-net/datafaker/pull/667
* Add Brand faker by @HattoriHenzo in https://github.com/datafaker-net/datafaker/pull/668
* Add static builder method for json transformer by @snuyanzin in https://github.com/datafaker-net/datafaker/pull/669
* Use CsvTransformer#builder in doc by @snuyanzin in https://github.com/datafaker-net/datafaker/pull/671
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<jbanking.version>4.1.0</jbanking.version>
<junit.version>5.9.2</junit.version>
<libphonenumber.version>8.13.2</libphonenumber.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>3.0.0-M8</maven-failsafe-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
Expand Down

0 comments on commit f1a3e50

Please sign in to comment.