Skip to content

Upgrade/java21 spring3 camel4 #94

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
assadriaz wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Upgrade/java21 spring3 camel4 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b303809
Update spring-boot 3.3.8, camel 4 and java 21 and other dependencies
assadriaz Mar 5, 2025
3786a78
update gha workflow use java 21
assadriaz Mar 5, 2025
94db2de
update Dockerfile use java 21
assadriaz Mar 5, 2025
4fa6ffc
update helm config
assadriaz Mar 5, 2025
fca4001
Replace https4 with https
assadriaz Mar 7, 2025
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 .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings.xml -O .github/workflows/settings.xml
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 21
distribution: liberica
- name: Cache Maven dependencies
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM adoptopenjdk/openjdk11:alpine-jre
FROM bellsoft/liberica-openjdk-alpine:21.0.5-11
WORKDIR /deployments
COPY target/asag-*-SNAPSHOT.jar asag.jar
RUN addgroup appuser && adduser --disabled-password appuser --ingroup appuser
Expand Down
2 changes: 1 addition & 1 deletion helm/asag/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ common:
enabled: false
configmap:
data:
JAVA_OPTIONS: -server -Xmx1500m -Dfile.encoding=UTF-8
JDK_JAVA_OPTIONS: -server -Xmx1500m -Dfile.encoding=UTF-8
TZ: Europe/Oslo
MAPBOX_DOWNLOAD_DIRECTORY: files/tmp/mapbox
enabled: true
Expand Down
228 changes: 49 additions & 179 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
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>
<groupId>org.entur.ror</groupId>
<artifactId>superpom</artifactId>
<version>3.4</version>
</parent>

<groupId>org.entur.asag</groupId>
<artifactId>asag</artifactId>
Expand All @@ -30,66 +35,38 @@
<connection>scm:git:ssh://[email protected]:entur/asag.git</connection>
<developerConnection>scm:git:ssh://[email protected]:entur/asag.git</developerConnection>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<docker.maven.plugin.version>0.21.0</docker.maven.plugin.version>
<spring-boot-plugin.version>2.1.1.RELEASE</spring-boot-plugin.version>
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<httpcomponents.version>4.5.2</httpcomponents.version>
<assertj-core.version>3.3.0</assertj-core.version>
<camel-version>2.22.3</camel-version>
<spring.security.version>4.2.3.RELEASE</spring.security.version>
<netex-java-model.version>1.0.13</netex-java-model.version>
<entur.helpers.version>1.86</entur.helpers.version>
<guava.version>26.0-jre</guava.version>
<hibernate-validator.version>5.2.3.Final</hibernate-validator.version>
<geojson-jackson.version>1.8.1</geojson-jackson.version>
<logstash-logback-encoder.version>5.3</logstash-logback-encoder.version>
<commons-compress.version>1.18</commons-compress.version>
<commons-io.version>1.3.2</commons-io.version>
<spring-cloud-contract-wiremock.version>1.2.2.RELEASE</spring-cloud-contract-wiremock.version>
<aws-java-sdk-s3.version>1.11.502</aws-java-sdk-s3.version>
<jaxb-api.version>2.3.0</jaxb-api.version>
<jaxb-runtime.version>2.3.0.1</jaxb-runtime.version>
<javax.activation.version>1.2.0</javax.activation.version>
<jslack-api-client.version>3.0.3</jslack-api-client.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<java.version>21</java.version>
<camel.version>4.8.4</camel.version>
<entur.helpers.version>4.9</entur.helpers.version>
<netex-java-model.version>2.0.14</netex-java-model.version>
<prettier-java.version>2.1.0</prettier-java.version>
<prettier-maven-plugin.version>0.22</prettier-maven-plugin.version>
<plugin.prettier.goal>write</plugin.prettier.goal>
<!-- empty argLine property, the value is set up by Jacoco during unit tests execution -->
<argLine/>
<helper.slack.version>5.1</helper.slack.version>
<geojson-jackson.version>1.14</geojson-jackson.version>
<aws-java-sdk-s3.version>1.12.782</aws-java-sdk-s3.version>
<spring-cloud-contract-wiremock.version>4.1.2</spring-cloud-contract-wiremock.version>
</properties>


<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-bom</artifactId>
<version>${camel.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
<dependency>
<groupId>de.grundid.opendatalab</groupId>
<artifactId>geojson-jackson</artifactId>
<version>${geojson-jackson.version}</version>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>${logstash-logback-encoder.version}</version>
</dependency>
<!--Entur dependencies-->
<dependency>
<groupId>org.entur.ror.helpers</groupId>
<artifactId>gcp-storage</artifactId>
<artifactId>storage-gcp-gcs</artifactId>
<version>${entur.helpers.version}</version>
<exclusions>
<exclusion>
Expand All @@ -104,126 +81,58 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-lite</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<groupId>org.entur</groupId>
<artifactId>netex-java-model</artifactId>
<version>${netex-java-model.version}</version>
</dependency>
<dependency>
<groupId>org.entur.ror.helpers</groupId>
<artifactId>slack</artifactId>
<version>${entur.helpers.version}</version>
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http-common</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http4</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jaxb</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty4-http</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jsonpath</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${httpcomponents.version}</version>
<version>${helper.slack.version}</version>
</dependency>
<!--Spring dependencies-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponents.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-json</artifactId>
</dependency>
<!--Camel dependencies-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.entur</groupId>
<artifactId>netex-java-model</artifactId>
<version>${netex-java-model.version}</version>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-http-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jackson-starter</artifactId>
</dependency>

<!--Other dependencies-->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<groupId>de.grundid.opendatalab</groupId>
<artifactId>geojson-jackson</artifactId>
<version>${geojson-jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-javaconfig</artifactId>
<version>${camel-version}</version>
<scope>test</scope>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk-s3.version}</version>
</dependency>

<!--Test dependencies-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring</artifactId>
<version>${camel-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<version>${camel-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -232,44 +141,14 @@
<version>${spring-cloud-contract-wiremock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk-s3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb-runtime.version}</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>
<dependency>
<groupId>com.github.seratch</groupId>
<artifactId>jslack-api-client</artifactId>
<version>${jslack-api-client.version}</version>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot-plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -278,15 +157,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<release>11</release>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
9 changes: 6 additions & 3 deletions src/main/java/org/entur/asag/AsagApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

package org.entur.asag;

import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.boot.CamelSpringBootApplicationController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
Expand All @@ -33,7 +33,7 @@ public class AsagApp extends RouteBuilder {

private static final Logger logger = LoggerFactory.getLogger(AsagApp.class);

@Produce(uri = "direct:uploadTiamatToMapboxAsGeoJson")
@Autowired
ProducerTemplate producerTemplate;

public static void main(String... args) throws Exception {
Expand All @@ -48,10 +48,13 @@ public static void main(String... args) throws Exception {
AsagApp asagApp = applicationContext.getBean(AsagApp.class);
asagApp.run();


}

private void run() {
producerTemplate.request("direct:uploadTiamatToMapboxAsGeoJson", System.out::println);

producerTemplate.sendBody("direct:uploadTiamatToMapboxAsGeoJson", "Startup payload");
logger.info("Sent message to direct:uploadTiamatToMapboxAsGeoJson");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/entur/asag/mapbox/AwsS3Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.model.ObjectMetadata;
import org.apache.camel.Body;
import org.apache.camel.Header;
Expand All @@ -45,7 +46,6 @@ public class AwsS3Uploader {
public AmazonS3Client createClient(MapBoxAwsCredentials mapBoxAwsCredentials) {
AWSCredentials credentials = new BasicSessionCredentials(mapBoxAwsCredentials.getAccessKeyId(),
mapBoxAwsCredentials.getSecretAccessKey(), mapBoxAwsCredentials.getSessionToken());

return new AmazonS3Client(credentials);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/entur/asag/mapbox/DeliveryPublicationStreamToGeoJson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.events.StartElement;
Expand Down
Loading