Skip to content

Commit

Permalink
Changes:
Browse files Browse the repository at this point in the history 
- Fixes/improvements
- POM: Versions now in properties
- Lib updates
  • Loading branch information
@autumoswitzerland
autumoswitzerland committed Sep 29, 2024
1 parent d62bda5 commit d093cd1
Show file tree
Hide file tree
Showing 7 changed files with 158 additions and 84 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
/tackle/
/tkltest_app_pom.xml
/javadoc.sh
/versions.sh
73 changes: 37 additions & 36 deletions THIRDPARTYLICENSES.html
View file

Large diffs are not rendered by default.

Binary file modified lib/repo/ch/autumo/beetroot/autumo-beetroot/3.1.0/autumo-beetroot-3.1.0.jar
View file
Binary file not shown.
Binary file modified lib/repo/org/nanohttpd/nanohttpd/BEETROOT-2.3.4/nanohttpd-BEETROOT-2.3.4.jar
View file
Binary file not shown.
123 changes: 81 additions & 42 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -43,6 +41,47 @@
<properties>
<localrepo>${project.basedir}/lib/repo</localrepo>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.maven.antrun.plugin>3.1.0</version.maven.antrun.plugin>
<version.maven.compiler.plugin>3.13.0</version.maven.compiler.plugin>
<version.maven.dependency.plugin>3.7.0</version.maven.dependency.plugin>
<version.maven.jar.plugin>3.3.0</version.maven.jar.plugin>
<version.maven.javadoc.plugin>3.7.0</version.maven.javadoc.plugin>
<version.maven.resources.plugin>3.3.1</version.maven.resources.plugin>
<version.maven.surefire.plugin>3.0.0-M5</version.maven.surefire.plugin>

<version.HikariCP>6.0.0</version.HikariCP>
<version.JColor>5.5.1</version.JColor>
<version.angus.activation>2.0.2</version.angus.activation>
<version.bcprov.jdk15on>1.70</version.bcprov.jdk15on>
<version.commons.cli>1.9.0</version.commons.cli>
<version.commons.codec>1.17.1</version.commons.codec>
<version.commons.dbutils>1.8.1</version.commons.dbutils>
<version.commons.io>2.17.0</version.commons.io>
<version.commons.text>1.12.0</version.commons.text>
<version.core>3.5.3</version.core>
<version.h2>2.3.232</version.h2>
<version.httpclient>4.5.14</version.httpclient>
<version.httpcore>4.4.16</version.httpcore>
<version.jakarta.activation.api>2.1.3</version.jakarta.activation.api>
<version.jakarta.mail>2.0.1</version.jakarta.mail>
<version.javase>3.5.3</version.javase>
<version.javax.mail.api>1.6.2</version.javax.mail.api>
<version.javax.servlet.api>4.0.1</version.javax.servlet.api>
<version.json>20240303</version.json>
<version.jsoup>1.18.1</version.jsoup>
<version.junit>4.13.2</version.junit>
<version.log4j.api>2.24.0</version.log4j.api>
<version.log4j.core>2.24.0</version.log4j.core>
<version.log4j.slf4j.impl>2.24.0</version.log4j.slf4j.impl>
<version.mariadb.java.client>3.4.1</version.mariadb.java.client>
<version.nanohttpd>BEETROOT-2.3.4</version.nanohttpd>
<version.passay>1.6.5</version.passay>
<version.postgresql>42.7.4</version.postgresql>
<version.spring.security.crypto>5.8.13</version.spring.security.crypto>
<version.totp>1.0</version.totp>
<version.twilio>10.5.2</version.twilio>

</properties>

<build>
Expand All @@ -51,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>${version.maven.jar.plugin}</version>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -64,7 +103,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<version>${version.maven.antrun.plugin}</version>
<executions>
<execution>
<phase>clean</phase>
Expand All @@ -84,22 +123,22 @@

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>${version.maven.compiler.plugin}</version>
<configuration>
<release>11</release>
<annotationProcessorPaths>
<path>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.23.1</version>
<version>${version.log4j.core}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>${version.maven.resources.plugin}</version>
<executions>
<execution>
<id>copy-license</id>
Expand Down Expand Up @@ -174,7 +213,7 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.7.0</version>
<version>${version.maven.dependency.plugin}</version>
<executions>
<execution>
<phase>install</phase>
Expand All @@ -193,7 +232,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.7.0</version>
<version>${version.maven.javadoc.plugin}</version>
<configuration>
<sourcepath>src/main/java</sourcepath>
<doclint>all,-missing</doclint>
Expand All @@ -205,7 +244,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>${version.maven.surefire.plugin}</version>
<configuration>
<!-- Optional classpath configuration for resources under web/ -->
<additionalClasspathElements>
Expand All @@ -225,7 +264,7 @@
<dependency>
<groupId>org.nanohttpd</groupId>
<artifactId>nanohttpd</artifactId>
<version>BEETROOT-2.3.4</version>
<version>${version.nanohttpd}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -234,21 +273,21 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.23.1</version>
<version>${version.log4j.slf4j.impl}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.23.1</version>
<version>${version.log4j.api}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.23.1</version>
<version>${version.log4j.core}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -257,35 +296,35 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.8.0</version>
<version>${version.commons.cli}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
<version>${version.commons.io}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.17.1</version>
<version>${version.commons.codec}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-dbutils</groupId>
<artifactId>commons-dbutils</artifactId>
<version>1.8.1</version>
<version>${version.commons.dbutils}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.12.0</version>
<version>${version.commons.text}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -294,14 +333,14 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
<version>${version.httpclient}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.16</version>
<version>${version.httpcore}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -310,14 +349,14 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20240303</version>
<version>${version.json}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.18.1</version>
<version>${version.jsoup}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -326,21 +365,21 @@
<dependency>
<groupId>de.taimos</groupId>
<artifactId>totp</artifactId>
<version>1.0</version>
<version>${version.totp}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.5.2</version>
<version>${version.core}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.5.3</version>
<version>${version.javase}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -349,7 +388,7 @@
<dependency>
<groupId>com.twilio.sdk</groupId>
<artifactId>twilio</artifactId>
<version>10.4.1</version>
<version>${version.twilio}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -358,7 +397,7 @@
<dependency>
<groupId>org.passay</groupId>
<artifactId>passay</artifactId>
<version>1.6.4</version>
<version>${version.passay}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -367,7 +406,7 @@
<dependency>
<groupId>com.diogonunes</groupId>
<artifactId>JColor</artifactId>
<version>5.5.1</version>
<version>${version.JColor}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -376,28 +415,28 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.3</version>
<version>${version.jakarta.activation.api}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
<version>2.0.2</version>
<version>${version.angus.activation}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>2.0.1</version>
<version>${version.jakarta.mail}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>1.6.2</version>
<version>${version.javax.mail.api}</version>
<scope>compile</scope>
</dependency>

Expand All @@ -406,7 +445,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<version>${version.javax.servlet.api}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -415,7 +454,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
<version>5.8.13</version>
<version>${version.spring.security.crypto}</version> <!-- Java 11-->
<scope>provided</scope>
</dependency>

Expand All @@ -425,7 +464,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.70</version>
<version>${version.bcprov.jdk15on}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -434,29 +473,29 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.1.0</version>
<version>${version.HikariCP}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.3.230</version>
<version>${version.h2}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.2</version>
<version>${version.postgresql}</version>
<scope>provided</scope>
</dependency>
<!-- com.impossibl.pgjdbc-ng : pgjdbc-ng : x.y.z -->

<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.4.1</version>
<version>${version.mariadb.java.client}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -465,7 +504,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>

Expand Down
Loading

0 comments on commit d093cd1

Please sign in to comment.