Skip to content

Instantly share code, notes, and snippets.

@magwas

magwas/gist:53d4cfcb7769d9f7f5ef5978fa121bf9

Created February 7, 2023 06:49
Show Gist options
  • Save magwas/53d4cfcb7769d9f7f5ef5978fa121bf9 to your computer and use it in GitHub Desktop.
Save magwas/53d4cfcb7769d9f7f5ef5978fa121bf9 to your computer and use it in GitHub Desktop.
Download ZIP
diff between nonworking and working setup
Raw
gistfile1.txt
diff --git a/.classpath b/.classpath
index 32cc52b..1e553d7 100644
--- a/.classpath
+++ b/.classpath
@@ -36,10 +36,10 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
@@ -47,5 +47,6 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/.project b/.project
index 2ac585f..7a5e3fc 100644
--- a/.project
+++ b/.project
@@ -37,10 +37,13 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
<filteredResources>
<filter>
diff --git a/pom.xml b/pom.xml
index b2e2a8e..bd7314f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.kodekonveyor</groupId>
<artifactId>angulartest-server</artifactId><!-- project name -->
- <version>1.0-7-ga7c9094</version><!--package version -->
+ <version>1.0-10-g22b99ab</version><!--package version -->
<packaging>war</packaging>
<name>angulartest</name><!-- project name -->
<description>Backend for angular test frontend</description>
@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.1</version>
+ <version>3.0.2</version>
</parent>
<licenses>
@@ -41,6 +41,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>19</maven.compiler.source>
<maven.compiler.target>19</maven.compiler.target>
+ <java.rmi.server.hostname>localhost</java.rmi.server.hostname>
</properties>
<build>
<plugins>
@@ -147,13 +148,13 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.4.0</version>
+ <version>[2.7.1,)</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.29</version>
+ <version>[1.2.0,)</version>
</dependency>
</dependencies>
@@ -386,7 +387,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>42.2.8</version>
+ <version>[42.3.3,)</version>
<type>pom</type>
</dependency>
<dependency>
@@ -414,15 +415,17 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>[2.7,)</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+ <version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
+ <version>2.14.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -437,7 +440,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.64</version>
+ <version>[1.66,)</version>
</dependency>
<dependency>
<groupId>org.modelmapper</groupId>
diff --git a/src/main/java/com/kodekonveyor/SecurityConfig.java b/src/main/java/com/kodekonveyor/SecurityConfig.java
index 2f6bf58..ee69861 100644
--- a/src/main/java/com/kodekonveyor/SecurityConfig.java
+++ b/src/main/java/com/kodekonveyor/SecurityConfig.java
@@ -30,7 +30,7 @@ public class SecurityConfig {
http
.authorizeHttpRequests(
authz -> authz
- .antMatchers(HttpMethod.GET, "/api/v1/hero")
+ .requestMatchers(HttpMethod.GET, "/api/v1/hero")
.hasAuthority("SCOPE_read:current_user")
.anyRequest().permitAll())
.oauth2ResourceServer(oauth2 -> oauth2.jwt())
diff --git a/src/main/java/com/kodekonveyor/SpringConfig.java b/src/main/java/com/kodekonveyor/SpringConfig.java
index ddd24ac..3d70278 100644
--- a/src/main/java/com/kodekonveyor/SpringConfig.java
+++ b/src/main/java/com/kodekonveyor/SpringConfig.java
@@ -5,7 +5,6 @@ import java.util.Optional;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.servlet.Filter;
import javax.sql.DataSource;
import org.modelmapper.ModelMapper;
@@ -30,6 +29,8 @@ import com.kodekonveyor.annotations.InterfaceClass;
import com.kodekonveyor.webapp.ResponseFilter;
import com.kodekonveyor.webapp.WebappConstants;
+import jakarta.servlet.Filter;
+
@EnableScheduling
@SpringBootApplication
@ServletComponentScan
diff --git a/src/main/java/com/kodekonveyor/angulartest/backend/HeroEntity.java b/src/main/java/com/kodekonveyor/angulartest/backend/HeroEntity.java
index 98ca5fe..5022f71 100644
--- a/src/main/java/com/kodekonveyor/angulartest/backend/HeroEntity.java
+++ b/src/main/java/com/kodekonveyor/angulartest/backend/HeroEntity.java
@@ -1,11 +1,10 @@
package com.kodekonveyor.angulartest.backend;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
import org.hibernate.annotations.GenericGenerator;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
diff --git a/src/main/java/com/kodekonveyor/webapp/ResponseFilter.java b/src/main/java/com/kodekonveyor/webapp/ResponseFilter.java
index fca4b28..be96228 100644
--- a/src/main/java/com/kodekonveyor/webapp/ResponseFilter.java
+++ b/src/main/java/com/kodekonveyor/webapp/ResponseFilter.java
@@ -2,18 +2,18 @@ package com.kodekonveyor.webapp;
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletResponse;
-
import com.kodekonveyor.annotations.ExcludeFromCodeCoverage;
import com.kodekonveyor.annotations.InterfaceClass;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletResponse;
+
@InterfaceClass
@ExcludeFromCodeCoverage("interface to underlying framework")
@WebFilter()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment