Skip to content

Commit

Permalink
Aloitettu Spring Boot -muutos
Browse files Browse the repository at this point in the history
  • Loading branch information
@augustk
augustk committed Nov 13, 2024
1 parent 5c82c89 commit 0a77498
Show file tree
Hide file tree
Showing 161 changed files with 9,734 additions and 14,888 deletions.
1 change: 1 addition & 0 deletions .java-version
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
21.0
834 changes: 125 additions & 709 deletions pom.xml
View file

Large diffs are not rendered by default.

180 changes: 50 additions & 130 deletions tarjonta-api/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,178 +1,98 @@
<!--
~ Copyright (c) 2012 The Finnish Board of Education - Opetushallitus
~
~ This program is free software: Licensed under the EUPL, Version 1.1 or - as
~ soon as they will be approved by the European Commission - subsequent versions
~ of the EUPL (the "Licence");
~
~ You may not use this work except in compliance with the Licence.
~ You may obtain a copy of the Licence at: http://www.osor.eu/eupl/
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ European Union Public Licence for more details.
-->

<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>tarjonta</artifactId>
<groupId>fi.vm.sade.tarjonta</groupId>
<version>2017-40-SNAPSHOT</version>
<relativePath>..</relativePath>
<version>2024-46-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tarjonta-api</artifactId>
<name>Tarjonta :: API</name>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>test</scope>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jersey</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-cas</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>${jsr311-api.version}</version>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- TEST Dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>${cxf.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-annotations_2.10</artifactId>
<version>${swagger_2.10.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring-security.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>

<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf-codegen-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-value-constructor</artifactId>
<version>${jaxb2-value-constructor.version}</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>${jaxb2-basics.version}</version>
</dependency>
</dependencies>
<!--plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.5.0</version>
<executions>
<execution>
<id>generate-tarjonta-api</id>
<phase>generate-sources</phase>
<configuration>
<sourceRoot>${project.build.directory}/generated-sources</sourceRoot>
<defaultOptions>
<bindingFiles>
<bindingFile>${basedir}/src/main/resources/wsdl/binding.xjb</bindingFile>
</bindingFiles>
<exceptionSuper>java.lang.RuntimeException</exceptionSuper>

<extraargs>
<extraarg>-frontend</extraarg>
<extraarg>jaxws21</extraarg>
<extraarg>-xjc-Xvalue-constructor</extraarg>
</extraargs>
</defaultOptions>
</configuration>
<id>xjc</id>
<goals>
<goal>wsdl2java</goal>
<goal>xjc</goal>
</goals>
</execution>
</executions>
</plugin>

<configuration>
<sources>
<source>src/main/resources/xsd/tarjonta.xsd</source>
</sources>
<xjbSources>
<xjbSource>src/main/resources/xjb/bindings.xjb</xjbSource>
</xjbSources>
</configuration>
</plugin-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>add-wsdl-source</id>
<phase>generate-sources</phase>
<id>attach-sources</id>
<goals>
<goal>add-source</goal>
<goal>jar</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
24 changes: 1 addition & 23 deletions tarjonta-api/src/main/java/fi/vm/sade/tarjonta/service/FaultBean.java
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
/*
* Copyright (c) 2012 The Finnish Board of Education - Opetushallitus
*
* This program is free software: Licensed under the EUPL, Version 1.1 or - as
* soon as they will be approved by the European Commission - subsequent versions
* of the EUPL (the "Licence");
*
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at: http://www.osor.eu/eupl/
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* European Union Public Licence for more details.
*/
package fi.vm.sade.tarjonta.service;

/**
*
* @author Jukka Raanamo
*/
public class FaultBean {

}

public class FaultBean {}
54 changes: 0 additions & 54 deletions tarjonta-api/src/main/java/fi/vm/sade/tarjonta/service/NoSuchOIDException.java
View file

This file was deleted.

70 changes: 0 additions & 70 deletions tarjonta-api/src/main/java/fi/vm/sade/tarjonta/service/helper/DateHelper.java
View file

This file was deleted.

Loading

0 comments on commit 0a77498

Please sign in to comment.