Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
svenruppert committed Mar 8, 2024
2 parents dd5b926 + d805c2d commit de9ccf7
Show file tree
Hide file tree
Showing 72 changed files with 648 additions and 437 deletions.
82 changes: 0 additions & 82 deletions .drone.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .m2/settings.xml

This file was deleted.

12 changes: 12 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"scanSettings": {
"baseBranches": []
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure",
"displayMode": "diff"
},
"issueSettings": {
"minSeverityLevel": "LOW"
}
}
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@ Only if you start using the JMS, it could be helpful to add a **module-info.java
Add the following lines, switch inside the pom.xml to the JDK version you prefer,
start a **mvn clean install** and be happy ;-)


```java
module rapidpm.functional.reactive {
exports org.rapidpm.frp;
exports org.rapidpm.frp.functions;
exports org.rapidpm.frp.matcher;
exports org.rapidpm.frp.memoizer;
exports org.rapidpm.frp.model;
exports org.rapidpm.frp.model.serial;
exports org.rapidpm.frp.reactive;
exports com.svenruppert.functional.functions;
exports com.svenruppert.functional.matcher;
exports com.svenruppert.functional.memoizer;
exports com.svenruppert.functional.model;
exports com.svenruppert.functional.model.serial;
exports com.svenruppert.functional.reactive;
}
```

Expand All @@ -72,6 +71,9 @@ This Lib is working with
<version>--version--</version>
</dependency>
```
## 02.00.00-SRU
Changing to new namespace. The package will be under
com.svenruppert:functional-reactive now


## 01.01.00-RPM-SNAPSHOT
Expand Down
12 changes: 6 additions & 6 deletions _data/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
module rapidpm.functional.reactive {
exports org.rapidpm.frp;
exports org.rapidpm.frp.functions;
exports org.rapidpm.frp.matcher;
exports org.rapidpm.frp.memoizer;
exports org.rapidpm.frp.model;
exports org.rapidpm.frp.model.serial;
exports org.rapidpm.frp.reactive;
exports com.svenruppert.functional.functions;
exports com.svenruppert.functional.matcher;
exports com.svenruppert.functional.memoizer;
exports com.svenruppert.functional.model;
exports com.svenruppert.functional.model.serial;
exports com.svenruppert.functional.reactive;
}
70 changes: 0 additions & 70 deletions _data/nexus/settings.xml

This file was deleted.

2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# limitations under the License.
#

docker rm deploy-functioanl-reactive
docker rm deploy-functional-reactive
docker-compose up
27 changes: 13 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,16 @@
version: '3.5'

services:
deploy:
# image: svenruppert/maven-3.6.1-adopt:1.8.212-04
image: svenruppert/deploy:1.8.0-222
container_name: deploy-functioanl-reactive
hostname: deploy-functioanl-reactive
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
- $PWD/:/usr/src/mymaven
working_dir: /usr/src/mymaven
# command: 'mvn help:active-profiles
command: 'mvn license:format clean deploy
-P_release_prepare
-P_release_sign-artifacts
-Dmaven.test.skip=true '
deploy:
image: svenruppert/deploy:21.0.1-zulu
container_name: deploy-functional-reactive
hostname: deploy-functional-reactive
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
- $PWD/:/usr/src/mymaven
working_dir: /usr/src/mymaven
# command: 'mvn help:active-profiles
command: 'mvn license:format clean deploy
-P_release_prepare
-P_release_sign-artifacts
-Dmaven.test.skip=true'
3 changes: 2 additions & 1 deletion docker_compile_locale.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ docker run \
--rm \
--name compile \
-v "$(pwd)":/usr/src/mymaven \
-v "$(pwd)":/usr/src/mymaven \
-w /usr/src/mymaven \
svenruppert/maven-3.6.1-adopt:1.8.212-04 \
svenruppert/zulu-dev:21.0.1-zulu \
mvn clean install
4 changes: 4 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
jdk:
- 21.0.2-open
before_install:
- sdk install maven 3.9.1
Loading

0 comments on commit de9ccf7

Please sign in to comment.