Skip to content

Commit

Permalink
Release 1.2.2 (Java 21) on all pis
Browse files Browse the repository at this point in the history
  • Loading branch information
@StefanSchubert
StefanSchubert committed Nov 5, 2023
1 parent 2f99c9e commit 34ed7e0
Show file tree
Hide file tree
Showing 15 changed files with 53 additions and 28 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# History of changes (since 5/2022)

## Release 1.2.2

### Technical Maintenance
* Common Patch-Management (Java 21 / Primefaces 13 / Dependencies)
* Mapping Layer (BE module), replaces by using Mapstruts

## Release 1.2.1
### Bugfixes
* i18n Language detection
Expand Down
19 changes: 10 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,15 @@ I have some siblings in my nano reef tank and need to do some gardening. But whe
Just have a look at the [Milestones](https://github.com/StefanSchubert/sabi/milestones?direction=asc&sort=due_date&state=open) from the Issue Board

## Latest project news
| Date | News |
|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| 09th Apr 2023 | Hotfix Release (i18n issues) |
| 18th Dez 2022 | Feature Release (Reminder Service) / Technical Migration to Spring-Boot 3 / Marks Sabi-Version 1.2.0 |
| 7th Okt 2022 | Released Plague-Center. All required base workflows have been implemented. This marks version 1.0.0 of sabi. |
| 22nd Jul 2022 | Article about SABI has been published in the journal "KORALLE", Issue Nr. 136. 😊 Available on start of August. Many Thanks goes to Daniel Knop! |
| 26th Feb 2022 | Offical Softlaunch Day of the project. Starting with a twitter announcement. Going to spread the word in selected forums in the next days, hoping to get some Beta-Testers, Fellow-Coders and to collect valuable feedback. |
| 27th Mai 2021 | I managed to replace the self-signed TLS cert with a let's encrypt based one. This gets us rid of the browsers insecure warning. |
| Date | News |
|---------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| 05th Nov 2023 | Service Release (Patchmanagement - e.g. Java 21) |
| 09th Apr 2023 | Hotfix Release (i18n issues) |
| 18th Dez 2022 | Feature Release (Reminder Service) / Technical Migration to Spring-Boot 3 / Marks Sabi-Version 1.2.0 |
| 7th Okt 2022 | Released Plague-Center. All required base workflows have been implemented. This marks version 1.0.0 of sabi. |
| 22nd Jul 2022 | Article about SABI has been published in the journal "KORALLE", Issue Nr. 136. 😊 Available on start of August. Many Thanks goes to Daniel Knop! |
| 26th Feb 2022 | Official Softlaunch Day of the project. Starting with a twitter announcement. Going to spread the word in selected forums in the next days, hoping to get some Beta-Testers, Fellow-Coders and to collect valuable feedback. |
| 27th Mai 2021 | I managed to replace the self-signed TLS cert with a let's encrypt based one. This gets us rid of the browsers insecure warning. |
| 16th Mai 2021 | **Sneak Preview** available on https://sabi-project.net (Notice: Only available if you have an **IPV6 Internet-Connection** (your mobile with wlan switched off should do it, if your home has only the half internet available). As of the zero budget start we have a self signed TLS resulting in a browsers insecure warning. Still some bugs of course (see issue list), and features left till release 1.0 but it's already usable. In case you decide to create an account...it's already the production environment ;-) i.e. your data will be kept. |

## Technology Stack
Expand All @@ -98,7 +99,7 @@ Just have a look at the [Milestones](https://github.com/StefanSchubert/sabi/mile
As you desire, the server API will be open, so that everyone might develop their own client or interface their existing product against sabi. However to start with this project involves a

* JSF2.3 based WebClient
* Primefaces 12
* Primefaces 13.x
* Spring-Boot-3

Why JSF and not some current modern framework like angular or VUE? In fact, it took me quite a while to came to a decision here.
Expand Down
5 changes: 4 additions & 1 deletion captcha/captcha-service.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Will be deployed aside of the jar, to set the memory options
# as the spring-boot-maven-plugin ignores the jvmArguments Option
export JAVA_OPTS="-Djava.io.tmpdir=/var/captcha/tmp -XX:-UsePerfData -XX:+UseZGC -XX:+ZGenerational -Xmx81m -Xms64m"
# Java 17
# export JAVA_OPTS="-Djava.io.tmpdir=/var/captcha/tmp -XX:-UsePerfData -XX:+UseZGC -XX:+ZGenerational -Xmx81m -Xms64m"
# Java 21
export JAVA_OPTS="-Djava.io.tmpdir=/var/captcha/tmp -XX:-UsePerfData -Xmx81m -Xms64m -XX:MaxMetaspaceSize=128m"
4 changes: 2 additions & 2 deletions captcha/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<springdoc.openapiv2.version>2.2.0</springdoc.openapiv2.version>
<micrometer.prometheus.version>1.11.4</micrometer.prometheus.version>
<micrometer.prometheus.version>1.11.5</micrometer.prometheus.version>
<junit.version>4.13.2</junit.version>
<owasp.plugin.version>8.4.0</owasp.plugin.version>
<owasp.plugin.version>8.4.2</owasp.plugin.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion devops/GenericPiMetricsEndpoint/pimetric-service.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Will be deployed aside of the jar, to set the memory options
# as the spring-boot-maven-plugin ignores the jvmArguments Option
export JAVA_OPTS="-Xmx96m -Xms32m -XX:+UseG1GC -XX:MaxMetaspaceSize=64m"
export JAVA_OPTS="-Xmx96m -Xms32m -XX:MaxMetaspaceSize=64m"
2 changes: 1 addition & 1 deletion devops/GenericPiMetricsEndpoint/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- Taking care to have all spring dependencies right. -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.4</version>
<version>3.1.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
6 changes: 3 additions & 3 deletions devops/ansible/deploySabiMonitoring.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
dest: /etc/systemd/system/nodeexporter.service
owner: root
group: root
- name: enforce deamon config reload
- name: enforce daemon config reload
command: systemctl daemon-reload
- name: Enable service nodeexporter and ensure it is not masked
systemd:
Expand Down Expand Up @@ -108,7 +108,7 @@
dest: /etc/systemd/system/prometheus.service
owner: root
group: root
- name: enforce deamon config reload
- name: enforce daemon config reload
command: systemctl daemon-reload
- name: Enable service prometheus and ensure it is not masked
systemd:
Expand Down Expand Up @@ -167,7 +167,7 @@
dest: /etc/systemd/system/grafana.service
owner: root
group: root
- name: enforce deamon config reload
- name: enforce daemon config reload
command: systemctl daemon-reload
- name: Enable service grafana and ensure it is not masked
systemd:
Expand Down
2 changes: 1 addition & 1 deletion devops/ansible/deploySabiWebclient.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
dest: /etc/systemd/system/sabi.service
owner: root
group: root
- name: enforce deamon config reload
- name: enforce daemon config reload
command: systemctl daemon-reload
- name: Enable service sabi and ensure it is not masked
systemd:
Expand Down
4 changes: 2 additions & 2 deletions sabi-boundary/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>de.bluewhale</groupId>
<artifactId>sabi-boundary</artifactId>
<version>1.2.3</version>
<version>1.2.4</version>
<packaging>jar</packaging>
<description>
Contains the DTOs and Utility classes which will be used by the server and client module.
Expand Down Expand Up @@ -42,7 +42,7 @@
<hibernate.validator.version>5.1.0.Final</hibernate.validator.version>
<aspectj.version>1.5.4</aspectj.version>
<springdoc.openapiv2.version>2.2.0</springdoc.openapiv2.version>
<owasp.plugin.version>8.4.0</owasp.plugin.version>
<owasp.plugin.version>8.4.2</owasp.plugin.version>
<maven.war.plugin.version>4.0.0-M2</maven.war.plugin.version>
<maven.clean.plugin.version>3.3.1</maven.clean.plugin.version>
<maven.site.plugin.version>4.0.0-M9</maven.site.plugin.version>
Expand Down
4 changes: 3 additions & 1 deletion sabi-database/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>21</java.version>
<flyway.version>9.10.1</flyway.version>
<flyway.version>10.0.0</flyway.version>
<mariadb.client.version>3.1.0</mariadb.client.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<versions.maven.plugin.version>2.16.1</versions.maven.plugin.version>
<owasp.plugin.version>8.4.0</owasp.plugin.version>
<!-- Uncomment those or place them into your maven settings.xml in an own profile as I won't
checkin those secrets for stage and production
Expand Down Expand Up @@ -127,6 +128,7 @@
controlled by version property variables -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${versions.maven.plugin.version}</version>
<executions>
<execution>
<phase>compile</phase>
Expand Down
8 changes: 8 additions & 0 deletions sabi-database/src/main/resources/db/migration/version1_2_0/V1_2_2_1__addMorePlagueTypes.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- Basic Data:
INSERT INTO plague (id, scientific_name, created_on, lastmod_on)
VALUES (6, 'Asterina', '2023-11-05 20:38:00', '2023-11-05 20:38:00');

INSERT INTO localized_plague (id, plague_id, common_name, language, created_on, lastmod_on)
VALUES (11, 6, 'Asterina starfish', 'en', '2023-11-05 20:38:00', '2023-11-05 20:38:00');
INSERT INTO localized_plague (id, plague_id, common_name, language, created_on, lastmod_on)
VALUES (12, 6, 'Asterina Seestern', 'de', '2023-11-05 20:38:00', '2023-11-05 20:38:00');
5 changes: 2 additions & 3 deletions sabi-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,17 @@
</developers>

<properties>
<sabi.boundary.version>1.2.3</sabi.boundary.version>
<sabi.boundary.version>1.2.4</sabi.boundary.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>21</java.version>
<log4j2.version>2.20.0</log4j2.version>
<springdoc.openapiv2.version>2.2.0</springdoc.openapiv2.version>
<!-- Last worked with Eclipselink 4.0.0 / Don't use EclipseLink 4.0.1 this breaks JPAConfigs / Try Eclipselink 4.0.2-->
<eclipselink.version>4.0.2</eclipselink.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<micrometer.prometheus.version>1.11.5</micrometer.prometheus.version>
<spring.instrument.version>6.0.12</spring.instrument.version>
<surefire.version>3.0.0-M7</surefire.version>
<surefire.version>3.2.1</surefire.version>
<lombok.version>1.18.30</lombok.version>
<owasp.plugin.version>8.4.2</owasp.plugin.version>
<passay.version>1.6.4</passay.version>
Expand Down
5 changes: 4 additions & 1 deletion sabi-server/sabi-service.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Will be deployed aside of the jar, to set the memory options
# as the spring-boot-maven-plugin ignores the jvmArguments Option
export JAVA_OPTS="-Djava.io.tmpdir=/var/sabi/tmp -XX:-UsePerfData -XX:+UseZGC -XX:+ZGenerational -Xmx96m -Xms64m -XX:MaxMetaspaceSize=128m"
# Java 17
# export JAVA_OPTS="-Djava.io.tmpdir=/var/sabi/tmp -XX:-UsePerfData -XX:+UseZGC -XX:+ZGenerational -Xmx96m -Xms64m -XX:MaxMetaspaceSize=128m"
# Java 21
export JAVA_OPTS="-Djava.io.tmpdir=/var/sabi/tmp -XX:-UsePerfData -Xmx96m -Xms64m -XX:MaxMetaspaceSize=128m"
4 changes: 2 additions & 2 deletions sabi-webclient/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>de.bluewhale</groupId>
<artifactId>sabi-webclient</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
<packaging>jar</packaging>
<name>sabi-webclient</name>
<description>A JSF based webclient for sabi.</description>
Expand Down Expand Up @@ -59,7 +59,7 @@
<jakarta.cdi.version>4.0.1</jakarta.cdi.version>
<micrometer.prometheus.version>1.11.5</micrometer.prometheus.version>
<joinfaces.version>5.1.4</joinfaces.version>
<sabi.boundary.version>1.2.3</sabi.boundary.version>
<sabi.boundary.version>1.2.4</sabi.boundary.version>
<passay.version>1.6.4</passay.version>
<owasp.plugin.version>8.4.2</owasp.plugin.version>
<lombok.version>1.18.30</lombok.version>
Expand Down
5 changes: 4 additions & 1 deletion sabi-webclient/sabi-webclient.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Will be deployed aside of the jar, to set the memory options
# as the spring-boot-maven-plugin ignores the jvmArguments Option
export JAVA_OPTS="-Djava.io.tmpdir=/var/sabi/tmp -XX:-UsePerfData -XX:+UseZGC -XX:+ZGenerational -Xmx128m -Xms64m"
# Java17:
# export JAVA_OPTS="-Djava.io.tmpdir=/var/sabi/tmp -XX:-UsePerfData -XX:+UseZGC -XX:+ZGenerational -Xmx128m -Xms64m"
# Java21:
export JAVA_OPTS="-Djava.io.tmpdir=/var/sabi/tmp -XX:-UsePerfData -Xmx128m -Xms64m -XX:MaxMetaspaceSize=128m"

0 comments on commit 34ed7e0

Please sign in to comment.