Skip to content

Commit c6cfad3

Browse files
fekynkofekynko
authored
Merge branch 'perplexhub:master' into master
2 parents 7960164 + 7f1ebb2 commit c6cfad3

File tree

10 files changed

+39
-37
lines changed

10 files changed

+39
-37
lines changed

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ jobs:
88

99
if: github.actor == github.event.repository.owner.login
1010

11+
env:
12+
MAVEN_REPO_USERNAME: ${{ secrets.nexus_username }}
13+
MAVEN_REPO_PASSWORD: ${{ secrets.nexus_password }}
1114
steps:
1215
- uses: actions/checkout@v2
1316
with:

‎.github/workflows/snapshot.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
if: "!contains(github.event.head_commit.message, '[maven-release-plugin] prepare')"
13-
13+
env:
14+
MAVEN_REPO_USERNAME: ${{ secrets.nexus_username }}
15+
MAVEN_REPO_PASSWORD: ${{ secrets.nexus_password }}
1416
steps:
1517
- uses: actions/checkout@v2
1618
- name: Set up JDK 17

‎README.md‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
# rsql-jpa-specification
22

3-
[![Sonatype Nexus (Releases)](https://img.shields.io/nexus/r/io.github.perplexhub/rsql?label=Release&logo=Release&server=https%3A%2F%2Foss.sonatype.org)](https://oss.sonatype.org/#nexus-search;gav~io.github.perplexhub~rsql*)
4-
[![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/io.github.perplexhub/rsql?label=Snapshot&logo=Snapshot&server=https%3A%2F%2Foss.sonatype.org)](https://oss.sonatype.org/#nexus-search;gav~io.github.perplexhub~rsql~~~)
5-
6-
[![Release Workflow Status](https://img.shields.io/github/actions/workflow/status/perplexhub/rsql-jpa-specification/release.yml?label=Release&style=plastic)](https://github.com/perplexhub/rsql-jpa-specification/actions/workflows/pull_request.yml)
7-
[![Snapshot Workflow Status](https://img.shields.io/github/actions/workflow/status/perplexhub/rsql-jpa-specification/snapshot.yml?label=Snapshot&style=plastic)](https://github.com/perplexhub/rsql-jpa-specification/actions/workflows/release.yml)
3+
[![Maven Central (Releases)](https://img.shields.io/maven-central/v/io.github.perplexhub/rsql)](https://central.sonatype.com/search?q=io.github.perplexhub+rsql)
4+
[![Release Workflow Status](https://img.shields.io/github/actions/workflow/status/perplexhub/rsql-jpa-specification/release.yml?label=Release&style=plastic)](https://github.com/perplexhub/rsql-jpa-specification/actions/workflows/release.yml)
5+
[![Snapshot Workflow Status](https://img.shields.io/github/actions/workflow/status/perplexhub/rsql-jpa-specification/snapshot.yml?label=Snapshot&style=plastic)](https://github.com/perplexhub/rsql-jpa-specification/actions/workflows/snapshot.yml)
86
[![PR Workflow Status](https://img.shields.io/github/actions/workflow/status/perplexhub/rsql-jpa-specification/pull_request.yml?label=Pull%20Request&style=plastic)](https://github.com/perplexhub/rsql-jpa-specification/actions/workflows/pull_request.yml)
97

108
Translate RSQL query into org.springframework.data.jpa.domain.Specification or com.querydsl.core.types.Predicate and support entities association query.
119

1210
## SpringBoot 3 Support
1311
rsql-jpa-specification supports SpringBoot 3 since version 6.x. (Contributed by [chriseteka](https://github.com/chriseteka))
1412

15-
For SpringBoot 2 users, please continue to use [version 5.x](https://github.com/perplexhub/rsql-jpa-specification/tree/5.x).
13+
For SpringBoot 2 users, please continue to use [version 5.x](https://github.com/perplexhub/rsql-jpa-specification/tree/5.x). [![Maven Central (Releases)](https://img.shields.io/maven-central/v/io.github.perplexhub/rsql?filter=5.*)](https://central.sonatype.com/search?q=io.github.perplexhub+rsql)
1614

1715

1816
[Supported Operators](https://github.com/perplexhub/rsql-jpa-specification/blob/master/rsql-common/src/main/java/io/github/perplexhub/rsql/RSQLOperators.java)
@@ -21,11 +19,11 @@ For SpringBoot 2 users, please continue to use [version 5.x](https://github.com/
2119

2220
## Maven Repository
2321

24-
<https://oss.sonatype.org/#nexus-search;gav~io.github.perplexhub~rsql*>
22+
<https://central.sonatype.com/search?q=io.github.perplexhub+rsql>
2523

2624
## Add rsql-jpa-spring-boot-starter for RSQL to Spring JPA translation
2725

28-
### Maven dependency for rsql-jpa-spring-boot-starter [![](https://img.shields.io/nexus/r/io.github.perplexhub/rsql-jpa-spring-boot-starter?color=black&label=%20&server=https%3A%2F%2Foss.sonatype.org)](https://oss.sonatype.org/#nexus-search;gav~io.github.perplexhub~rsql-jpa-spring-boot-starter*)
26+
### Maven dependency for rsql-jpa-spring-boot-starter [![](https://img.shields.io/maven-central/v/io.github.perplexhub/rsql-jpa-spring-boot-starter?label=%20&color=black)](https://central.sonatype.com/artifact/io.github.perplexhub/rsql-jpa-spring-boot-starter/versions)
2927

3028
```xml
3129
<dependency>
@@ -73,7 +71,7 @@ public class Application {
7371

7472
## Add rsql-querydsl-spring-boot-starter for RSQL to Spring JPA and QueryDSL translation
7573

76-
### Maven dependency for rsql-querydsl-spring-boot-starter [![](https://img.shields.io/nexus/r/io.github.perplexhub/rsql-querydsl-spring-boot-starter?color=black&label=%20&server=https%3A%2F%2Foss.sonatype.org)](https://oss.sonatype.org/#nexus-search;gav~io.github.perplexhub~rsql-querydsl-spring-boot-starter*)
74+
### Maven dependency for rsql-querydsl-spring-boot-starter [![](https://img.shields.io/maven-central/v/io.github.perplexhub/rsql-querydsl-spring-boot-starter?label=%20&color=black)](https://central.sonatype.com/artifact/io.github.perplexhub/rsql-querydsl-spring-boot-starter/versions)
7775

7876
```xml
7977
<dependency>

‎pom.xml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>io.github.perplexhub</groupId>
44
<artifactId>rsql</artifactId>
5-
<version>6.0.28-SNAPSHOT</version>
5+
<version>6.0.33-SNAPSHOT</version>
66
<packaging>pom</packaging>
77
<name>io.github.perplexhub - RSQL</name>
88
<inceptionYear>2018</inceptionYear>
@@ -88,18 +88,17 @@
8888
</dependencyManagement>
8989
<build>
9090
<plugins>
91-
<plugin>
92-
<groupId>org.sonatype.plugins</groupId>
93-
<artifactId>nexus-staging-maven-plugin</artifactId>
94-
<version>1.6.13</version>
91+
<plugin>
92+
<groupId>org.sonatype.central</groupId>
93+
<artifactId>central-publishing-maven-plugin</artifactId>
94+
<version>0.8.0</version>
9595
<extensions>true</extensions>
9696
<configuration>
97-
<serverId>ossrh</serverId>
98-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
99-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
100-
<stagingProgressTimeoutMinutes>60</stagingProgressTimeoutMinutes>
97+
<publishingServerId>central</publishingServerId>
98+
<autoPublish>true</autoPublish>
99+
<waitUntil>validated</waitUntil>
101100
</configuration>
102-
</plugin>
101+
</plugin>
103102
<plugin>
104103
<artifactId>maven-compiler-plugin</artifactId>
105104
<version>3.10.1</version>
@@ -296,8 +295,8 @@
296295
</profiles>
297296
<distributionManagement>
298297
<snapshotRepository>
299-
<id>ossrh</id>
300-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
298+
<id>central</id>
299+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
301300
</snapshotRepository>
302301
</distributionManagement>
303302
</project>

‎rsql-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.github.perplexhub</groupId>
55
<artifactId>rsql</artifactId>
6-
<version>6.0.28-SNAPSHOT</version>
6+
<version>6.0.33-SNAPSHOT</version>
77
</parent>
88
<artifactId>rsql-common</artifactId>
99
<packaging>jar</packaging>

‎rsql-jpa-spring-boot-starter/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.github.perplexhub</groupId>
55
<artifactId>rsql</artifactId>
6-
<version>6.0.28-SNAPSHOT</version>
6+
<version>6.0.33-SNAPSHOT</version>
77
</parent>
88
<artifactId>rsql-jpa-spring-boot-starter</artifactId>
99
<packaging>jar</packaging>
@@ -12,12 +12,12 @@
1212
<dependency>
1313
<groupId>io.github.perplexhub</groupId>
1414
<artifactId>rsql-jpa</artifactId>
15-
<version>6.0.28-SNAPSHOT</version>
15+
<version>6.0.33-SNAPSHOT</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>io.github.perplexhub</groupId>
1919
<artifactId>rsql-common</artifactId>
20-
<version>6.0.28-SNAPSHOT</version>
20+
<version>6.0.33-SNAPSHOT</version>
2121
<type>test-jar</type>
2222
<scope>test</scope>
2323
</dependency>

‎rsql-jpa/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.github.perplexhub</groupId>
55
<artifactId>rsql</artifactId>
6-
<version>6.0.28-SNAPSHOT</version>
6+
<version>6.0.33-SNAPSHOT</version>
77
</parent>
88
<artifactId>rsql-jpa</artifactId>
99
<packaging>jar</packaging>
@@ -12,12 +12,12 @@
1212
<dependency>
1313
<groupId>io.github.perplexhub</groupId>
1414
<artifactId>rsql-common</artifactId>
15-
<version>6.0.28-SNAPSHOT</version>
15+
<version>6.0.33-SNAPSHOT</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>io.github.perplexhub</groupId>
1919
<artifactId>rsql-common</artifactId>
20-
<version>6.0.28-SNAPSHOT</version>
20+
<version>6.0.33-SNAPSHOT</version>
2121
<type>test-jar</type>
2222
<scope>test</scope>
2323
</dependency>

‎rsql-querydsl-spring-boot-starter/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.github.perplexhub</groupId>
55
<artifactId>rsql</artifactId>
6-
<version>6.0.28-SNAPSHOT</version>
6+
<version>6.0.33-SNAPSHOT</version>
77
</parent>
88
<artifactId>rsql-querydsl-spring-boot-starter</artifactId>
99
<packaging>jar</packaging>
@@ -12,12 +12,12 @@
1212
<dependency>
1313
<groupId>io.github.perplexhub</groupId>
1414
<artifactId>rsql-querydsl</artifactId>
15-
<version>6.0.28-SNAPSHOT</version>
15+
<version>6.0.33-SNAPSHOT</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>io.github.perplexhub</groupId>
1919
<artifactId>rsql-common</artifactId>
20-
<version>6.0.28-SNAPSHOT</version>
20+
<version>6.0.33-SNAPSHOT</version>
2121
<type>test-jar</type>
2222
<scope>test</scope>
2323
</dependency>

‎rsql-querydsl/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.github.perplexhub</groupId>
55
<artifactId>rsql</artifactId>
6-
<version>6.0.28-SNAPSHOT</version>
6+
<version>6.0.33-SNAPSHOT</version>
77
</parent>
88
<artifactId>rsql-querydsl</artifactId>
99
<packaging>jar</packaging>
@@ -12,12 +12,12 @@
1212
<dependency>
1313
<groupId>io.github.perplexhub</groupId>
1414
<artifactId>rsql-jpa</artifactId>
15-
<version>6.0.28-SNAPSHOT</version>
15+
<version>6.0.33-SNAPSHOT</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>io.github.perplexhub</groupId>
1919
<artifactId>rsql-common</artifactId>
20-
<version>6.0.28-SNAPSHOT</version>
20+
<version>6.0.33-SNAPSHOT</version>
2121
<type>test-jar</type>
2222
<scope>test</scope>
2323
</dependency>

‎rsql-support/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.github.perplexhub</groupId>
55
<artifactId>rsql</artifactId>
6-
<version>6.0.28-SNAPSHOT</version>
6+
<version>6.0.33-SNAPSHOT</version>
77
</parent>
88
<artifactId>rsql-jpa-specification</artifactId>
99
<packaging>jar</packaging>
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>io.github.perplexhub</groupId>
1414
<artifactId>rsql-querydsl</artifactId>
15-
<version>6.0.28-SNAPSHOT</version>
15+
<version>6.0.33-SNAPSHOT</version>
1616
<exclusions>
1717
<exclusion>
1818
<groupId>com.querydsl</groupId>

0 commit comments

Comments
 (0)