jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

Compare commits

base: jomu:fb1b3001ac488e4cb0908186fdfe66baab386ac9
Branches Tags
jomu:develop jomu:bugfix/fix_mail jomu:feature/jakrtaee10 jomu:main
jomu:v2.0.0 jomu:v1.3.1 jomu:v1.3.0 jomu:v1.2.1 jomu:v1.2 jomu:v1.1 jomu:v1.0
...
compare: jomu:v1.3.1
Branches Tags
jomu:bugfix/fix_mail jomu:feature/jakrtaee10 jomu:develop jomu:main
jomu:v2.0.0 jomu:v1.3.1 jomu:v1.3.0 jomu:v1.2.1 jomu:v1.2 jomu:v1.1 jomu:v1.0

6 Commits
fb1b3001ac ... v1.3.1

Author SHA1 Message Date
Joern Muehlencord
f2387ffe92 [maven-release-plugin] prepare release v1.3.1 2023-02-24 08:52:12 +01:00
Joern Muehlencord
c844c7a504 [maven-release-plugin] prepare for next development iteration 2023-02-19 11:11:17 +01:00
Joern Muehlencord
5c74d12622 [maven-release-plugin] prepare release v1.3.0 2023-02-19 11:11:15 +01:00
Joern Muehlencord
62ceea63bc updated dependencies 2023-02-19 11:10:36 +01:00
Joern Muehlencord
32af3caf77 [maven-release-plugin] prepare for next development iteration 2022-06-12 01:13:28 +02:00
Joern Muehlencord
70302edc58 [maven-release-plugin] prepare release v1.2.1 2022-06-12 01:13:25 +02:00
13 changed files with 419 additions and 411 deletions
Expand all files Collapse all files

2
configuration/pom.xml
View File

@ -24,7 +24,7 @@ limitations under the License.
<parent>
<artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<name>shared-configuration</name>

3
db/pom.xml
View File

@ -25,7 +25,7 @@ limitations under the License.
<parent>
<artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<name>shared-db</name>
@ -75,7 +75,6 @@ limitations under the License.
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
<version>1.18.12</version>
</dependency>
</dependencies>

2
jeeutil/pom.xml
View File

@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<groupId>de.muehlencord.shared</groupId>

12
jeeutil/src/main/java/de/muehlencord/shared/jeeutil/GenericEnumType.java
View File

@ -57,8 +57,8 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
}
@Override
public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
return nullSafeGet(rs, names, owner);
public Object nullSafeGet(ResultSet rs, int index, SharedSessionContractImplementor implementor, Object o) throws SQLException {
return nullSafeGet(rs, index, implementor);
}
@Override
@ -104,8 +104,8 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
return false;
}
public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws SQLException {
String value = rs.getString(names[0]);
public Object nullSafeGet(ResultSet rs, int index, Object owner) throws SQLException {
String value = rs.getString(index);
if (!rs.wasNull()) {
return enumMap.get(value);
}
@ -130,9 +130,5 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
return clazz;
}
@Override
public int[] sqlTypes() {
return new int[]{sqlType};
}
}

10
jeeutil/src/main/java/de/muehlencord/shared/jeeutil/restexfw/APIErrorResponse.java
View File

@ -15,14 +15,14 @@
*/
package de.muehlencord.shared.jeeutil.restexfw;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.Locale;
import java.util.ResourceBundle;
import javax.ws.rs.core.Response;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
/**
*

6
jeeutil/src/main/java/de/muehlencord/shared/jeeutil/restexfw/ConstraintViolationEntry.java
View File

@ -15,12 +15,12 @@
*/
package de.muehlencord.shared.jeeutil.restexfw;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import java.util.Iterator;
import javax.validation.ConstraintViolation;
import javax.validation.Path;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
*

6
jeeutil/src/main/java/de/muehlencord/shared/jeeutil/restexfw/ResponseStatusAdapter.java
View File

@ -15,14 +15,14 @@
*/
package de.muehlencord.shared.jeeutil.restexfw;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import javax.ws.rs.core.Response;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.ws.rs.core.Response.Status;
/**
*
* @author Joern Muehlencord (joern@muehlencord.de)
*/
public class ResponseStatusAdapter extends XmlAdapter<String, Response.Status> {
public class ResponseStatusAdapter extends XmlAdapter<String, Status> {
@Override
public String marshal(Response.Status status) throws Exception {

4
network/pom.xml
View File

@ -72,7 +72,7 @@ limitations under the License.
<parent>
<artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -80,5 +80,5 @@ limitations under the License.
<url>http://maven.apache.org</url>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</project>

4
poi-util/pom.xml
View File

@ -47,9 +47,9 @@ limitations under the License.
<parent>
<artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</project>

3
poi-util/src/main/java/de/muehlencord/shared/poi/WorkbookApp.java
View File

@ -34,7 +34,6 @@ import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.ptg.RefPtgBase;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.DataValidation;
import org.apache.poi.ss.usermodel.DataValidationHelper;
import org.apache.poi.ss.usermodel.Row;
@ -184,7 +183,7 @@ public class WorkbookApp {
newCell.setCellValue(oldCell.getNumericCellValue());
break;
case BLANK:
newCell.setCellType(CellType.BLANK);
newCell.setBlank();
break;
case BOOLEAN:
newCell.setCellValue(oldCell.getBooleanCellValue());

52
pom.xml
View File

@ -19,7 +19,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<artifactId>shared</artifactId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
<name>shared</name>
<packaging>pom</packaging>
@ -51,7 +51,7 @@ limitations under the License.
<scm>
<connection>scm:git:git@jomu.timelord.de:jomu/shared.git</connection>
<developerConnection>scm:git:git@jomu.timelord.de:jomu/shared.git</developerConnection>
<tag>HEAD</tag>
<tag>v1.3.1</tag>
<url>https://jomu.timelord.de/git/jomu/shared/</url>
</scm>
@ -74,12 +74,26 @@ limitations under the License.
<properties>
<!-- project setup -->
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>1.7.32</slf4j.version>
<jackson.version>2.13.0</jackson.version>
<slf4j.version>2.0.6</slf4j.version>
<jackson.version>2.14.2</jackson.version>
<shiro.version>1.11.0</shiro.version>
<lombok.version>1.18.26</lombok.version>
<junit.version>5.9.2</junit.version>
<primefaces.version>12.0.0</primefaces.version>
<adminfaces-template.version>1.6.1</adminfaces-template.version>
<omnifaces.version>4.0.1</omnifaces.version>
<poi.version>5.2.3</poi.version>
<commons-net.version>3.9.0</commons-net.version>
<gson.version>2.10.1</gson.version>
<fusionauth.version>5.2.2</fusionauth.version>
<bouncycastle.version>1.70</bouncycastle.version>
<hibernate.version>6.1.7.Final</hibernate.version>
</properties>
<dependencyManagement>
@ -113,7 +127,7 @@ limitations under the License.
<dependency>
<artifactId>commons-net</artifactId>
<groupId>commons-net</groupId>
<version>3.8.0</version>
<version>${commons-net.version}</version>
</dependency>
<dependency>
<artifactId>commons-lang3</artifactId>
@ -154,7 +168,7 @@ limitations under the License.
<dependency>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
<version>2.8.9</version>
<version>${gson.version}</version>
</dependency>
<dependency>
<artifactId>jackson-annotations</artifactId>
@ -176,12 +190,12 @@ limitations under the License.
<dependency>
<artifactId>shiro-core</artifactId>
<groupId>org.apache.shiro</groupId>
<version>1.7.1</version>
<version>${shiro.version}</version>
</dependency>
<dependency>
<artifactId>shiro-web</artifactId>
<groupId>org.apache.shiro</groupId>
<version>1.7.1</version>
<version>${shiro.version}</version>
</dependency>
<dependency>
<artifactId>javaee-api</artifactId>
@ -202,39 +216,39 @@ limitations under the License.
<dependency>
<artifactId>bcprov-jdk15on</artifactId>
<groupId>org.bouncycastle</groupId>
<version>1.68</version>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<artifactId>hibernate-core</artifactId>
<groupId>org.hibernate</groupId>
<type>jar</type>
<version>5.6.3.Final</version>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<artifactId>primefaces</artifactId>
<groupId>org.primefaces</groupId>
<version>10.0.0</version>
<version>${primefaces.version}</version>
</dependency>
<dependency>
<artifactId>admin-template</artifactId>
<groupId>com.github.adminfaces</groupId>
<version>1.3.0</version>
<version>${adminfaces-template.version}</version>
</dependency>
<dependency>
<artifactId>omnifaces</artifactId>
<groupId>org.omnifaces</groupId>
<version>3.4.1</version>
<version>${omnifaces.version}</version>
</dependency>
<dependency>
<artifactId>poi-ooxml</artifactId>
<groupId>org.apache.poi</groupId>
<version>5.2.0</version>
<version>${poi.version}</version>
</dependency>
<dependency>
<artifactId>fusionauth-jwt</artifactId>
<groupId>io.fusionauth</groupId>
<version>4.1.0</version>
<version>${fusionauth.version}</version>
</dependency>
<!-- Dev Tools -->
@ -242,7 +256,7 @@ limitations under the License.
<artifactId>lombok</artifactId>
<groupId>org.projectlombok</groupId>
<scope>provided</scope>
<version>1.18.22</version>
<version>${lombok.version}</version>
</dependency>
<!-- Testing -->
@ -250,7 +264,7 @@ limitations under the License.
<artifactId>junit-jupiter-engine</artifactId>
<groupId>org.junit.jupiter</groupId>
<scope>test</scope>
<version>5.8.2</version>
<version>${junit.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

2
shiro-faces/pom.xml
View File

@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>de.muehlencord</groupId>
<artifactId>shared</artifactId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<name>shared-shiro-faces</name>

2
util/pom.xml
View File

@ -26,7 +26,7 @@ limitations under the License.
<parent>
<artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</parent>