Commit 160df840 authored by michael.simon's avatar michael.simon
Browse files

Update Java EE from 6 to 8

Change JAXB to maven import and change class packages from javax.jaxb to
jakarta.jaxb
parent 20332a86
...@@ -136,6 +136,15 @@ ...@@ -136,6 +136,15 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jboss.bom</groupId> <groupId>org.wildfly.bom</groupId>
<artifactId>jboss-javaee-6.0-with-hibernate</artifactId> <artifactId>wildfly-javaee8-with-tools</artifactId>
<version>1.0.1.Final</version> <version>17.0.1.Final</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
<optional>false</optional> <optional>false</optional>
</dependency> </dependency>
...@@ -46,11 +46,6 @@ ...@@ -46,11 +46,6 @@
<artifactId>hibernate-entitymanager</artifactId> <artifactId>hibernate-entitymanager</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
......
...@@ -20,19 +20,7 @@ ...@@ -20,19 +20,7 @@
<version>2.7.4</version> <version>2.7.4</version>
</parent> </parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
<version>1.0.1.Final</version>
<type>pom</type>
<scope>import</scope>
<optional>false</optional>
</dependency>
</dependencies>
</dependencyManagement>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
...@@ -64,11 +52,6 @@ ...@@ -64,11 +52,6 @@
<artifactId>hibernate-entitymanager</artifactId> <artifactId>hibernate-entitymanager</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
......
...@@ -146,6 +146,12 @@ ...@@ -146,6 +146,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
package edu.kit.scc.nextcloud; package edu.kit.scc.nextcloud;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "ocs") @XmlRootElement(name = "ocs")
public class NextcloudAnswer { public class NextcloudAnswer {
......
...@@ -2,7 +2,7 @@ package edu.kit.scc.nextcloud; ...@@ -2,7 +2,7 @@ package edu.kit.scc.nextcloud;
import java.util.ArrayList; import java.util.ArrayList;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
public class NextcloudGroups { public class NextcloudGroups {
......
package edu.kit.scc.nextcloud; package edu.kit.scc.nextcloud;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
public class NextcloudMeta { public class NextcloudMeta {
......
package edu.kit.scc.nextcloud; package edu.kit.scc.nextcloud;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
public class NextcloudUser { public class NextcloudUser {
......
...@@ -7,9 +7,9 @@ import java.util.ArrayList; ...@@ -7,9 +7,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.net.ssl.SSLException; import javax.net.ssl.SSLException;
import javax.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException; import jakarta.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller; import jakarta.xml.bind.Unmarshaller;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
......
...@@ -127,6 +127,12 @@ ...@@ -127,6 +127,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -163,11 +169,6 @@ ...@@ -163,11 +169,6 @@
</webResources> </webResources>
</configuration> </configuration>
</plugin> </plugin>
<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId>
<version>1.3.1</version> <executions> <execution> <goals> <goal>schemagen</goal>
</goals> <phase>generate-resources</phase> <configuration> <includes> <include>edu/kit/scc/webreg/rest/dto/*.java</include>
</includes> <outputDirectory>${project.build.directory}/schemas</outputDirectory>
</configuration> </execution> </executions> </plugin> -->
</plugins> </plugins>
</build> </build>
......
...@@ -2,10 +2,10 @@ package edu.kit.scc.webreg.rest.dto; ...@@ -2,10 +2,10 @@ package edu.kit.scc.webreg.rest.dto;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name="attrq-response") @XmlRootElement(name="attrq-response")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
......
...@@ -2,10 +2,10 @@ package edu.kit.scc.webreg.rest.dto; ...@@ -2,10 +2,10 @@ package edu.kit.scc.webreg.rest.dto;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name="ecp-response") @XmlRootElement(name="ecp-response")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
......
package edu.kit.scc.webreg.rest.dto; package edu.kit.scc.webreg.rest.dto;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class RestError { public class RestError {
......
...@@ -26,16 +26,29 @@ ...@@ -26,16 +26,29 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.wildfly.bom</groupId>
<artifactId>wildfly-javaee8-with-tools</artifactId>
<version>17.0.1.Final</version>
<type>pom</type>
<scope>import</scope>
<optional>false</optional>
</dependency>
<dependency> <dependency>
<groupId>javax</groupId> <groupId>javax</groupId>
<artifactId>javaee-api</artifactId> <artifactId>javaee-api</artifactId>
<version>6.0</version> <version>8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1.Final</version> <version>3.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>3.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.opensaml</groupId> <groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-api</artifactId> <artifactId>opensaml-saml-api</artifactId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment