Skip to content

Commit

Permalink
More updates and cleanups for Jakarta EE 10.
Browse files Browse the repository at this point in the history
  • Loading branch information
@meier-rene
meier-rene committed Oct 24, 2024
1 parent b6d848e commit 8312f5a
Show file tree
Hide file tree
Showing 15 changed files with 103 additions and 205 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: maven
- run: mvn -Dhttps.protocols=TLSv1.2 -B package --file pom.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: maven
- run: mvn -Dhttps.protocols=TLSv1.2 package -pl MetFragCommandLine -am -DskipTests
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LocalDatabasesFolderForWeb = /vol/file_databases' > /MetFragRelaunched/MetFragWe
RUN mvn -Dhttps.protocols=TLSv1.2 -f MetFragRelaunched clean package -pl MetFragLib -pl MetFragWeb -am -DskipTests


FROM tomee:9
FROM tomee:10

RUN set -eux; \
apt-get update; \
Expand Down
158 changes: 64 additions & 94 deletions MetFragRest/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,97 +1,67 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.ipbhalle.metfrag</groupId>
<artifactId>MetFrag</artifactId>
<version>2.6.0 </version>
</parent>
<groupId>de.ipbhalle.metfrag.metfragrest</groupId>
<artifactId>MetFragRest</artifactId>
<packaging>jar</packaging>
<name>MetFragRest</name>
<url>http://maven.apache.org</url>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.ipbhalle.metfrag</groupId>
<artifactId>MetFrag</artifactId>
<version>2.6.0</version>
</parent>
<groupId>de.ipbhalle.metfrag.metfragrest</groupId>
<artifactId>MetFragRest</artifactId>
<packaging>jar</packaging>
<name>MetFragRest</name>
<url>http://maven.apache.org</url>

<dependencies>
<dependency>
<groupId>de.ipbhalle.metfraglib</groupId>
<artifactId>MetFragLib</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<!-- <dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>3.1.10</version>
</dependency>-->
<!-- <dependency>
<groupId>org.springframework.hateoas</groupId>
<artifactId>spring-hateoas</artifactId>
</dependency> -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-hateoas</artifactId>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>compile</scope>
</dependency>

<!-- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>-->
</dependencies>
<dependencyManagement>
<dependencies>
<!-- Override Spring Data release train provided by Spring Boot -->
<!-- <dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-releasetrain</artifactId>
<version>Fowler-SR2</version>
<scope>import</scope>
<type>pom</type>
</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.5.15</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.15</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>de.ipbhalle.metfraglib</groupId>
<artifactId>MetFragLib</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-hateoas</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.5.15</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.15</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion MetFragRest/src/main/java/de/ipbhalle/metfragrest/MetFragRestController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

import jakarta.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponse;

import org.apache.log4j.Logger;
import org.apache.tomcat.util.http.fileupload.FileUtils;
Expand Down
10 changes: 6 additions & 4 deletions MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/CompareSpectraD3JSBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

import java.awt.image.RenderedImage;
import java.io.IOException;
import java.io.Serializable;
import java.util.Random;

import jakarta.faces.bean.ManagedBean;
import jakarta.faces.bean.SessionScoped;
import jakarta.enterprise.context.SessionScoped;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.ActionEvent;
import javax.imageio.ImageIO;

import jakarta.inject.Named;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
Expand Down Expand Up @@ -36,9 +38,9 @@
import de.ipbhalle.metfraglib.settings.MetFragGlobalSettings;
import de.ipbhalle.metfraglib.settings.Settings;

@ManagedBean
@Named
@SessionScoped
public class CompareSpectraD3JSBean {
public class CompareSpectraD3JSBean implements Serializable {

private String peakList1;
private String peakList2;
Expand Down
6 changes: 3 additions & 3 deletions MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragLandingBean.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package de.ipbhalle.metfragweb.controller;

import jakarta.annotation.PostConstruct;
import jakarta.faces.bean.ManagedBean;
import jakarta.faces.bean.RequestScoped;
import jakarta.enterprise.context.RequestScoped;
import jakarta.faces.context.FacesContext;

import de.ipbhalle.metfraglib.parameter.Constants;
import de.ipbhalle.metfraglib.parameter.VariableNames;
import de.ipbhalle.metfragweb.datatype.Parameter;

import jakarta.inject.Named;
import jakarta.servlet.http.HttpServletRequest;

import org.primefaces.PrimeFaces;


@ManagedBean
@Named
@RequestScoped
public class MetFragLandingBean {

Expand Down
10 changes: 6 additions & 4 deletions MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragWebBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@

import java.awt.image.RenderedImage;
import java.io.IOException;
import java.io.Serializable;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;

import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.SessionScoped;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.bean.ManagedBean;
import jakarta.faces.bean.SessionScoped;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.ActionEvent;
import jakarta.faces.model.SelectItem;
import javax.imageio.ImageIO;

import jakarta.inject.Named;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
Expand Down Expand Up @@ -72,9 +74,9 @@
import de.ipbhalle.metfragweb.validator.SmartsExpressionValidator;
import de.ipbhalle.metfragweb.validator.SmartsValidator;

@ManagedBean
@Named
@SessionScoped
public class MetFragWebBean {
public class MetFragWebBean implements Serializable {

private final String version = "v2.6.0";
/*
Expand Down
70 changes: 0 additions & 70 deletions MetFragWeb/src/main/webapp/WEB-INF/faces-config.xml
View file

This file was deleted.

Loading

0 comments on commit 8312f5a

Please sign in to comment.