Skip to content

Commit

Permalink
Merge branch 'main' into feature/essentials
Browse files Browse the repository at this point in the history
  • Loading branch information
@shortthirdman
shortthirdman committed Jun 17, 2024
2 parents e307c74 + 2860465 commit 29d77c7
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ A Java common library

> shortthirdman-org/PrimeKit is built on the following main stack:
- <img width='25' height='25' src='https://img.stackshare.io/service/995/K85ZWV2F.png' alt='Java'/> [Java](https://www.java.com) – Languages
- <img width='25' height='25' src='https://img.stackshare.io/service/2006/spring-framework-project-logo.png' alt='Spring Framework'/> [Spring Framework](https://spring.io/projects/spring-framework) – Frameworks (Full Stack)
- <img width='25' height='25' src='https://img.stackshare.io/service/1028/ASOhU5xJ.png' alt='PostgreSQL'/> [PostgreSQL](http://www.postgresql.org/) – Databases
- <img width='25' height='25' src='https://img.stackshare.io/service/7624/IG6D4Ro2_400x400.png' alt='Spring Data'/> [Spring Data](https://spring.io/projects/spring-data) – Database Tools
- <img width='25' height='25' src='https://img.stackshare.io/service/11563/actions.png' alt='GitHub Actions'/> [GitHub Actions](https://github.com/features/actions) – Continuous Integration
- <img width='25' height='25' src='https://img.stackshare.io/service/2020/874086.png' alt='JUnit'/> [JUnit](http://junit.org/) – Testing Frameworks
- <img width='25' height='25' src='https://img.stackshare.io/service/995/K85ZWV2F.png' alt='Java'/> [Java](https://www.java.com) – Languages
- <img width='25' height='25' src='https://img.stackshare.io/service/2006/spring-framework-project-logo.png' alt='Spring Framework'/> [Spring Framework](https://spring.io/projects/spring-framework) – Frameworks (Full Stack)
- <img width='25' height='25' src='https://img.stackshare.io/service/1028/ASOhU5xJ.png' alt='PostgreSQL'/> [PostgreSQL](http://www.postgresql.org/) – Databases
- <img width='25' height='25' src='https://img.stackshare.io/service/7624/IG6D4Ro2_400x400.png' alt='Spring Data'/> [Spring Data](https://spring.io/projects/spring-data) – Database Tools
- <img width='25' height='25' src='https://img.stackshare.io/service/11563/actions.png' alt='GitHub Actions'/> [GitHub Actions](https://github.com/features/actions) – Continuous Integration
- <img width='25' height='25' src='https://img.stackshare.io/service/2020/874086.png' alt='JUnit'/> [JUnit](http://junit.org/) – Testing Frameworks

Full tech stack [here](/techstack.md)

Expand Down
2 changes: 1 addition & 1 deletion primekit-essentials/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<lombok.version>1.18.30</lombok.version>
<springframework.version>6.1.6</springframework.version>
<springframework.version>6.1.8</springframework.version>
<spring-data.version>3.2.5</spring-data.version>
<fasterxml-jackson.version>2.15.4</fasterxml-jackson.version>
<jakarta.xml-bind.version>4.0.2</jakarta.xml-bind.version>
Expand Down
24 changes: 12 additions & 12 deletions techstack.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
## Tech Stack
shortthirdman-org/PrimeKit is built on the following main stack:
- [Java](https://www.java.com) – Languages
- [Spring Framework](https://spring.io/projects/spring-framework) – Frameworks (Full Stack)
- [PostgreSQL](http://www.postgresql.org/) – Databases
- [Spring Data](https://spring.io/projects/spring-data) – Database Tools
- [GitHub Actions](https://github.com/features/actions) – Continuous Integration
- [JUnit](http://junit.org/) – Testing Frameworks
- [Java](https://www.java.com) – Languages
- [Spring Framework](https://spring.io/projects/spring-framework) – Frameworks (Full Stack)
- [PostgreSQL](http://www.postgresql.org/) – Databases
- [Spring Data](https://spring.io/projects/spring-data) – Database Tools
- [GitHub Actions](https://github.com/features/actions) – Continuous Integration
- [JUnit](http://junit.org/) – Testing Frameworks
Full tech stack [here](/techstack.md)
Expand All @@ -18,12 +18,12 @@ Full tech stack [here](/techstack.md)
## Tech Stack
shortthirdman-org/PrimeKit is built on the following main stack:
- <img width='25' height='25' src='https://img.stackshare.io/service/995/K85ZWV2F.png' alt='Java'/> [Java](https://www.java.com) – Languages
- <img width='25' height='25' src='https://img.stackshare.io/service/2006/spring-framework-project-logo.png' alt='Spring Framework'/> [Spring Framework](https://spring.io/projects/spring-framework) – Frameworks (Full Stack)
- <img width='25' height='25' src='https://img.stackshare.io/service/1028/ASOhU5xJ.png' alt='PostgreSQL'/> [PostgreSQL](http://www.postgresql.org/) – Databases
- <img width='25' height='25' src='https://img.stackshare.io/service/7624/IG6D4Ro2_400x400.png' alt='Spring Data'/> [Spring Data](https://spring.io/projects/spring-data) – Database Tools
- <img width='25' height='25' src='https://img.stackshare.io/service/11563/actions.png' alt='GitHub Actions'/> [GitHub Actions](https://github.com/features/actions) – Continuous Integration
- <img width='25' height='25' src='https://img.stackshare.io/service/2020/874086.png' alt='JUnit'/> [JUnit](http://junit.org/) – Testing Frameworks
- <img width='25' height='25' src='https://img.stackshare.io/service/995/K85ZWV2F.png' alt='Java'/> [Java](https://www.java.com) – Languages
- <img width='25' height='25' src='https://img.stackshare.io/service/2006/spring-framework-project-logo.png' alt='Spring Framework'/> [Spring Framework](https://spring.io/projects/spring-framework) – Frameworks (Full Stack)
- <img width='25' height='25' src='https://img.stackshare.io/service/1028/ASOhU5xJ.png' alt='PostgreSQL'/> [PostgreSQL](http://www.postgresql.org/) – Databases
- <img width='25' height='25' src='https://img.stackshare.io/service/7624/IG6D4Ro2_400x400.png' alt='Spring Data'/> [Spring Data](https://spring.io/projects/spring-data) – Database Tools
- <img width='25' height='25' src='https://img.stackshare.io/service/11563/actions.png' alt='GitHub Actions'/> [GitHub Actions](https://github.com/features/actions) – Continuous Integration
- <img width='25' height='25' src='https://img.stackshare.io/service/2020/874086.png' alt='JUnit'/> [JUnit](http://junit.org/) – Testing Frameworks
Full tech stack [here](/techstack.md)
Expand Down
2 changes: 1 addition & 1 deletion techstack.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ tools:
last_updated_by: Swetank Mohanty
last_updated_on: 2024-06-08 18:03:01.000000000 Z
- name: Spring Data
description: Provides a consistent approach to data access – relational, non-relational,
description: Provides a consistent approach to data access – relational, non-relational,
map-reduce, and beyond
website_url: https://spring.io/projects/spring-data
license: Apache-2.0
Expand Down

0 comments on commit 29d77c7

Please sign in to comment.