Skip to content

Commit

Permalink
Merge pull request #175 from cinovo/dvalin-update
Browse files Browse the repository at this point in the history 
Dvalin update
  • Loading branch information
@marc92w
marc92w authored Mar 8, 2024
2 parents 7b68dbd + 4e59833 commit fff88dd
Show file tree
Hide file tree
Showing 16 changed files with 303 additions and 246 deletions.
25 changes: 0 additions & 25 deletions .github/workflows/code_quality.yml
View file

This file was deleted.

170 changes: 132 additions & 38 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>oss-parent</artifactId>
<groupId>org.sonatype.oss</groupId>
<version>9</version>
</parent>

<groupId>de.cinovo.cloudconductor</groupId>
<artifactId>cloudconductor-server</artifactId>
<version>3.12-SNAPSHOT</version>
Expand Down Expand Up @@ -35,6 +31,33 @@
<developerConnection>scm:git:[email protected]:cinovo/cloudconductor-server.git</developerConnection>
<tag>HEAD</tag>
</scm>
<repositories>
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>


<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>${sonatypeOssDistMgmtSnapshotsUrl}</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<developers>
<developer>
<id>psigloch</id>
Expand All @@ -58,11 +81,13 @@
<!-- Shared version number properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dvalin.version>1.34</dvalin.version>
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
<dvalin.version>1.35</dvalin.version>
<cloudconductor.api.version>3.9</cloudconductor.api.version>
<aws.version>1.12.467</aws.version>
<aws.version>1.12.641</aws.version>
<junit.version>5.10.1</junit.version>
<jetty.version>9.4.53.v20231009</jetty.version>
</properties>

<dependencies>
<dependency>
<groupId>de.cinovo.cloudconductor</groupId>
Expand All @@ -86,47 +111,66 @@
<artifactId>dvalin-jaxrs-jwtauth</artifactId>
<version>${dvalin.version}</version>
</dependency>
<!-- needed to fix CVE 2023 33201, remove after dependency is updated in dvalin -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.74</version>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws.version}</version>
</dependency>

<!-- needed for clean jetty dependencies, remove in future dvalin version if no longer needed -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
<version>${jetty.version}</version>
</dependency>
<!-- needed to fix CVE-2023-52428, remove after dvalin fixes this vulnerability-->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.37.3</version>
</dependency>
<!-- Database drivers -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.5.2</version>
<version>42.7.2</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.0.33</version>
<version>8.2.0</version>
</dependency>

<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.2</version>
<version>2.7.2</version>
<classifier>jdk8</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<prerequisites>
<maven>3.0.0</maven>
</prerequisites>
<build>
<finalName>${project.groupId}.${project.artifactId}</finalName>
<pluginManagement>
Expand Down Expand Up @@ -156,17 +200,17 @@
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.5.3</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -175,7 +219,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
<version>3.0.1</version>
<configuration>
<arguments>-Psonatype-oss-release,webapp</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
Expand All @@ -185,7 +229,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
Expand All @@ -207,7 +251,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<version>3.6.0</version>
<executions>
<execution>
<id>copy-dependencies</id>
Expand All @@ -228,7 +272,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>3.1.0</version>
<configuration>
<mainClass>de.cinovo.cloudconductor.server.ServerStarter</mainClass>
<systemProperties>
Expand All @@ -240,10 +284,13 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.4</version>
<version>3.6.0</version>
<configuration>
<descriptor>src/main/assembly/zip.xml</descriptor>
<descriptors>
<descriptor>src/main/assembly/zip.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
Expand All @@ -262,7 +309,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<executions>
<execution>
<id>npm install (initialize)</id>
Expand Down Expand Up @@ -302,10 +349,23 @@
<id>sonatype-oss-release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
<executions>
<execution>
<phase>verify</phase>
Expand Down Expand Up @@ -450,7 +510,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.6.2</version>
<configuration>
<additionalDependencies>
<dependency>
Expand All @@ -464,7 +524,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<executions>
<execution>
<phase>verify</phase>
Expand All @@ -485,6 +545,40 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>[3.2.5,)</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
4 changes: 0 additions & 4 deletions qodana.yaml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/de/cinovo/cloudconductor/server/util/GenericModelApiConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private static Method getGetter(Class<?> clazz, String fieldname) throws NoSuchM
}

private static String capitalize(String name) {
return name != null && name.length() != 0 ? name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1) : name;
return name != null && !name.isEmpty() ? name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1) : name;
}

private static <Destination, Origin> HashMap<Field, Field> resolveFieldMapFromOrigin(Origin origin, Destination destination) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/de/cinovo/cloudconductor/server/APITest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import de.cinovo.cloudconductor.api.lib.helper.AuthHandler;
import de.taimos.daemon.log4j.Log4jLoggingConfigurer;
import de.taimos.daemon.spring.SpringDaemonTestRunner.RunnerConfiguration;
import de.taimos.daemon.spring.RunnerConfiguration;
import de.taimos.httputils.HTTPRequest;
import de.taimos.httputils.WS;

Expand All @@ -36,7 +36,7 @@
@RunnerConfiguration(config = TestConfig.class, svc = "cloudconductor", loggingConfigurer = Log4jLoggingConfigurer.class)
public abstract class APITest {

private String token;
private final String token;

protected APITest() {
this.token = new AuthHandler(this.getCSApi()).auth();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/de/cinovo/cloudconductor/server/TestConfig.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.cinovo.cloudconductor.server;

import de.taimos.daemon.spring.Configuration;
import de.taimos.daemon.spring.SpringDaemonTestRunner.RunnerConfig;
import de.taimos.daemon.spring.RunnerConfig;

/**
*
Expand Down
Loading

0 comments on commit fff88dd

Please sign in to comment.