Skip to content

Wip/jdk 17 migration #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
splanes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Wip/jdk 17 migration #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion k2-archetype-application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.github.katari</groupId>
<artifactId>k2-parent</artifactId>
<version>0.1.9-SNAPSHOT</version>
<version>0.1.13-SNAPSHOT</version>
<relativePath>../k2-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion k2-archetype-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.github.katari</groupId>
<artifactId>k2-parent</artifactId>
<version>0.1.9-SNAPSHOT</version>
<version>0.1.13-SNAPSHOT</version>
<relativePath>../k2-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion k2-build-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.github.katari</groupId>
<artifactId>k2</artifactId>
<version>0.1.9-SNAPSHOT</version>
<version>0.1.13-SNAPSHOT</version>
</parent>

<artifactId>k2-build-tools</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions k2-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<?xml version="1.0" encoding="UTF-8"?>

<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">
Expand All @@ -9,7 +10,7 @@
<parent>
<groupId>com.github.katari</groupId>
<artifactId>k2-parent</artifactId>
<version>0.1.9-SNAPSHOT</version>
<version>0.1.13-SNAPSHOT</version>
<relativePath>../k2-parent/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -67,8 +68,8 @@
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
28 changes: 13 additions & 15 deletions k2-core/src/main/java/com/k2/core/DispatcherServletConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,27 @@

package com.k2.core;

import org.springframework.web.servlet.config.annotation
.ResourceHandlerRegistration;
import org.springframework.web.servlet.config.annotation
.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation
.WebMvcConfigurationSupport;
import org.springframework.web.servlet.mvc.method.annotation
.RequestMappingHandlerAdapter;
import org.springframework.web.servlet.mvc.method.annotation
.RequestMappingHandlerMapping;

import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support
.PropertySourcesPlaceholderConfigurer;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.format.FormatterRegistry;
import org.springframework.format.datetime.standard.DateTimeFormatterRegistrar;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.web.servlet.config.annotation
.ResourceHandlerRegistration;
import org.springframework.web.servlet.config.annotation
.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation
.WebMvcConfigurationSupport;
import org.springframework.web.servlet.mvc.method.annotation
.RequestMappingHandlerAdapter;
import org.springframework.web.servlet.mvc.method.annotation
.RequestMappingHandlerMapping;

/** Custom configuration for the dispatcher servlet application context
*
Expand Down Expand Up @@ -85,8 +83,8 @@ protected RequestMappingHandlerMapping createRequestMappingHandlerMapping() {
@Bean
public RequestMappingHandlerAdapter requestMappingHandlerAdapter(
final List<HttpMessageConverter<?>> converters) {
RequestMappingHandlerAdapter adapter;
adapter = super.requestMappingHandlerAdapter();
RequestMappingHandlerAdapter adapter =
super.createRequestMappingHandlerAdapter();

if (!converters.isEmpty()) {
adapter.setMessageConverters(converters);
Expand Down
8 changes: 4 additions & 4 deletions k2-core/src/main/java/com/k2/core/HomeServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

import java.io.IOException;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.Validate;
import org.springframework.web.servlet.view.RedirectView;
Expand Down
2 changes: 1 addition & 1 deletion k2-core/src/main/java/com/k2/core/K2WebApplicationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.LinkedList;
import java.util.List;

import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;

import org.apache.commons.lang3.Validate;

Expand Down
2 changes: 1 addition & 1 deletion k2-core/src/main/java/com/k2/core/ModuleDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.beans.Introspector;
import java.lang.reflect.Method;

import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;

import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
Expand Down
6 changes: 3 additions & 3 deletions k2-core/src/main/java/com/k2/core/WebConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ public void customize(final Server pServer) {
* shows a hardcoded message.
*/
@Bean(name = "k2.homeServlet")
public ServletRegistrationBean homeServlet(
public ServletRegistrationBean<HomeServlet> homeServlet(
@Qualifier("k2.landingUrl") final String landingUrl) {

HomeServlet homeServlet = new HomeServlet(landingUrl);
ServletRegistrationBean servletBean;
servletBean = new ServletRegistrationBean(homeServlet, false, "");
ServletRegistrationBean<HomeServlet> servletBean;
servletBean = new ServletRegistrationBean<>(homeServlet, false, "");
servletBean.setOrder(Integer.MAX_VALUE);
return servletBean;
}
Expand Down
12 changes: 6 additions & 6 deletions k2-core/src/test/java/com/k2/core/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

import java.io.IOException;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse;

import org.junit.BeforeClass;
import org.junit.Test;
Expand Down
11 changes: 6 additions & 5 deletions k2-hibernate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.github.katari</groupId>
<artifactId>k2-parent</artifactId>
<version>0.1.9-SNAPSHOT</version>
<version>0.1.13-SNAPSHOT</version>
<relativePath>../k2-parent/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -73,8 +73,9 @@
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>

<!-- ++++++++++++++++++++++++++++++++++++++++++++++ -->
Expand All @@ -86,8 +87,8 @@
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
Loading