micord/ervu-secret
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get jaxb version from platform bom

Browse source
This commit is contained in:
kochetkov 2024-09-27 10:31:27 +03:00
parent f17ab649cc
commit 245225bc7d
12 changed files with 21 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config-data-executor/pom.xml
View file

@ -55,12 +55,12 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>com.arangodb</groupId>

2
config-data-executor/src/main/java/org/micord/models/AqlConnectionParams.java
View file

@ -2,7 +2,7 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElement;
/**
* @author Maksim Tereshin

2
config-data-executor/src/main/java/org/micord/models/AqlRequest.java
View file

@ -2,7 +2,7 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElement;
/**
* @author Maksim Tereshin

4
config-data-executor/src/main/java/org/micord/models/Request.java
View file

@ -2,8 +2,8 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlSeeAlso;
import java.util.List;
/**

6
config-data-executor/src/main/java/org/micord/models/RequestArgument.java
View file

@ -2,9 +2,9 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementWrapper;
import jakarta.xml.bind.annotation.XmlRootElement;
import java.util.List;
/**

4
config-data-executor/src/main/java/org/micord/models/Requests.java
View file

@ -2,8 +2,8 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import java.util.List;
/**

2
config-data-executor/src/main/java/org/micord/models/S3ConnectionParams.java
View file

@ -2,7 +2,7 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElement;
/**
* @author Maksim Tereshin

2
config-data-executor/src/main/java/org/micord/models/S3Request.java
View file

@ -2,7 +2,7 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElement;
/**
* @author Maksim Tereshin

2
config-data-executor/src/main/java/org/micord/models/SqlConnectionParams.java
View file

@ -2,7 +2,7 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElement;
@Setter
public class SqlConnectionParams {

2
config-data-executor/src/main/java/org/micord/models/SqlRequest.java
View file

@ -2,7 +2,7 @@ package org.micord.models;
import lombok.Setter;
import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElement;
/**
* @author Maksim Tereshin

6
config-data-executor/src/main/java/org/micord/utils/ConfigLoader.java
View file

@ -10,9 +10,9 @@ import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
import org.micord.models.CachedConfig;
import org.micord.models.Requests;

10
pom.xml
View file

@ -397,16 +397,6 @@
<scope>provided</scope>
<version>1.18.34</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.arangodb</groupId>
<artifactId>arangodb-java-driver</artifactId>