Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into Feature/create-jpro-u…
Browse files Browse the repository at this point in the history
…tils-module

# Conflicts:
#	README.md
#	jpro-auth/core/build.gradle
#	jpro-html-scrollpane/build.gradle
  • Loading branch information
besidev committed Nov 12, 2024
2 parents 3ea06e4 + fed7438 commit 3d6fb5c
Show file tree
Hide file tree
Showing 21 changed files with 88 additions and 70 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
### 0.4.4-SNAPSHOT (TBD)
### 0.4.5 (TBD)

----------------------

### 0.4.4 (November 8, 2024)

#### Improvements
* Updated **JPro** to version `2024.4.1`. Starting with this release `jpro-webapi` module is pulled from Maven Central
Repository.

#### Features
* Merge the content of `internal-openlink`, `internal-util`, `freeze-detector` and `tree-showing` modules under the
Expand Down
60 changes: 30 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ and OAuth2 (and to some extent OpenID Connect) implementation.
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-auth-core</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-auth-core:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-auth-core:0.4.5-SNAPSHOT")
}
```

Expand All @@ -82,15 +82,15 @@ Creates human and AI friendly String representations of JavaFX SceneGraphs.
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-scenegraph</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-scenegraph:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-scenegraph:0.4.5-SNAPSHOT")
}
```

Expand All @@ -103,15 +103,15 @@ This library provides a simple way to pick, drop, upload and download files in *
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-file</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-file:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-file:0.4.5-SNAPSHOT")
}
```

Expand Down Expand Up @@ -147,15 +147,15 @@ to the desired size.
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-image-manager</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-image-manager:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-image-manager:0.4.5-SNAPSHOT")
}
```

Expand All @@ -169,15 +169,15 @@ using SMTP and SMTPS protocols. It also provides a simple way to compose and sen
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-mail</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-mail:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-mail:0.4.5-SNAPSHOT")
}
```

Expand All @@ -192,7 +192,7 @@ all while utilizing the same codebase.
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-media</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -213,7 +213,7 @@ plugins {
}
dependencies {
implementation("one.jpro.platform:jpro-media:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-media:0.4.5-SNAPSHOT")
implementation "org.bytedeco:javacv-platform:1.5.10" // use compileOnly configuration when running/deploying with JPro
}
```
Expand All @@ -231,15 +231,15 @@ Currently, there are three routing modules available:
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-routing-core</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-routing-core:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-routing-core:0.4.5-SNAPSHOT")
}
```

Expand All @@ -251,15 +251,15 @@ dependencies {
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-routing-dev</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-routing-dev:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-routing-dev:0.4.5-SNAPSHOT")
}
```

Expand All @@ -271,15 +271,15 @@ dependencies {
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-routing-popup</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-routing-popup:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-routing-popup:0.4.5-SNAPSHOT")
}
```

Expand All @@ -292,15 +292,15 @@ This library allows you to render Markdown formatted content in your **JPro/Java
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-mdfx</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-mdfx:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-mdfx:0.4.5-SNAPSHOT")
}
```

Expand All @@ -315,15 +315,15 @@ This data is only accessible in the JPro Server, not in the browser - which can
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-session</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-session:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-session:0.4.5-SNAPSHOT")
}
```

Expand All @@ -336,15 +336,15 @@ This library offers essential tools for various functionalities to enhance the d
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-utils</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependency>
```

#### Gradle configuration
```groovy
dependencies {
implementation 'one.jpro.platform:jpro-utils:0.4.4-SNAPSHOT'
implementation 'one.jpro.platform:jpro-utils:0.4.5-SNAPSHOT'
}
```

Expand All @@ -365,15 +365,15 @@ capabilities.
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-webrtc</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-webrtc:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-webrtc:0.4.5-SNAPSHOT")
}
```

Expand All @@ -388,15 +388,15 @@ the embedded controls. The video can be played in full-screen mode.
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-youtube</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-youtube:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-youtube:0.4.5-SNAPSHOT")
}
```

Expand Down Expand Up @@ -425,15 +425,15 @@ Provides a skin implementation of a scrollpane for **JPro** applications only.
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-html-scrollpane</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```

#### Gradle configuration
```groovy
dependencies {
implementation("one.jpro.platform:jpro-html-scrollpane:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-html-scrollpane:0.4.5-SNAPSHOT")
}
```

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
JPRO_PLATFORM_VERSION = 0.4.4-SNAPSHOT
JPRO_PLATFORM_VERSION = 0.4.5-SNAPSHOT

JPRO_VERSION = 2024.3.3
JPRO_VERSION = 2024.4.1
JAVAFX_VERSION = 17.0.12
SIMPLEFX_VERSION = 3.2.37
JMEMORYBUDDY_VERSION = 0.5.6
Expand Down
8 changes: 4 additions & 4 deletions jpro-auth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ processes. Add the following configuration to your project based on the build to
- Gradle
```groovy
dependencies {
implementation("one.jpro.platform:jpro-auth:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-auth:0.4.5-SNAPSHOT")
}
```
- Maven
Expand All @@ -110,7 +110,7 @@ processes. Add the following configuration to your project based on the build to
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-auth-core</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```
Expand All @@ -121,7 +121,7 @@ the authentication process. Add the following configuration to your project base
- Gradle
```groovy
dependencies {
implementation("one.jpro.platform:jpro-auth-routing:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-auth-routing:0.4.5-SNAPSHOT")
}
```
- Maven
Expand All @@ -130,7 +130,7 @@ the authentication process. Add the following configuration to your project base
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-auth-routing</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```
Expand Down
2 changes: 1 addition & 1 deletion jpro-auth/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

dependencies {
api project(":jpro-utils")
implementation "com.sandec.jpro:jpro-webapi:$JPRO_VERSION"
implementation "one.jpro:jpro-webapi:$JPRO_VERSION"
implementation "com.auth0:java-jwt:$AUTH0_JAVAJWT_VERSION"
implementation "one.jpro.platform.jpms:jwks-rsa:$AUTH0_JWKSRSA_VERSION"
implementation "org.jetbrains:annotations:$JETBRAINS_ANNOTATIONS_VERSION"
Expand Down
4 changes: 2 additions & 2 deletions jpro-file/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ a specified callback handler is invoked for further processing.
- Gradle
```groovy
dependencies {
implementation("one.jpro.platform:jpro-file:0.4.4-SNAPSHOT")
implementation("one.jpro.platform:jpro-file:0.4.5-SNAPSHOT")
}
```
- Maven
Expand All @@ -87,7 +87,7 @@ a specified callback handler is invoked for further processing.
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-file</artifactId>
<version>0.4.4-SNAPSHOT</version>
<version>0.4.5-SNAPSHOT</version>
</dependency>
</dependencies>
```
Expand Down
2 changes: 1 addition & 1 deletion jpro-file/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
implementation "com.sandec.jpro:jpro-webapi:$JPRO_VERSION"
implementation "one.jpro:jpro-webapi:$JPRO_VERSION"
implementation "org.jetbrains:annotations:$JETBRAINS_ANNOTATIONS_VERSION"
implementation "org.slf4j:slf4j-api:$SLF4J_API_VERSION"
runtimeOnly "ch.qos.logback:logback-classic:$LOGBACK_VERSION"
Expand Down
2 changes: 1 addition & 1 deletion jpro-file/example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

dependencies {
implementation project(":jpro-file")
implementation "com.sandec.jpro:jpro-webapi:$JPRO_VERSION"
implementation "one.jpro:jpro-webapi:$JPRO_VERSION"
implementation "commons-io:commons-io:$COMMONS_IO_VERSION"
implementation "io.github.mkpaz:atlantafx-base:$ATLANTAFX_VERSION"
implementation "org.kordamp.ikonli:ikonli-javafx:$IKONLI_VERSION"
Expand Down
2 changes: 1 addition & 1 deletion jpro-html-scrollpane/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
api project(":jpro-utils")
implementation "com.sandec.jpro:jpro-webapi:$JPRO_VERSION"
implementation "one.jpro:jpro-webapi:$JPRO_VERSION"
implementation "one.jpro:jmemorybuddy:$JMEMORYBUDDY_VERSION"
implementation "org.slf4j:slf4j-api:$SLF4J_API_VERSION"
}
Expand Down
2 changes: 1 addition & 1 deletion jpro-image-manager/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
implementation "org.slf4j:slf4j-api:$SLF4J_API_VERSION"
implementation "com.sandec.jpro:jpro-webapi:$JPRO_VERSION"
implementation "one.jpro:jpro-webapi:$JPRO_VERSION"
implementation "org.json:json:$JSON_VERSION"
}

Expand Down
Loading

0 comments on commit 3d6fb5c

Please sign in to comment.