Skip to content

Commit caf8840

Browse files
ulisseslimaulisseslima
authored
Merge pull request #18927 from panos-kakos/JAVA-49532
[JAVA-49532]
2 parents f1903c1 + 6efe242 commit caf8840

File tree

9 files changed

+54
-55
lines changed

9 files changed

+54
-55
lines changed

‎apache-spark-2/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>apache-spark-2</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
9-
<name>apache-spark</name>
9+
<name>apache-spark-2</name>
1010

1111
<parent>
1212
<groupId>com.baeldung</groupId>
@@ -36,7 +36,7 @@
3636
<plugins>
3737
<plugin>
3838
<artifactId>maven-assembly-plugin</artifactId>
39-
<version>3.3.0</version>
39+
<version>${maven-assembly-plugin.version}</version>
4040
<executions>
4141
<execution>
4242
<phase>package</phase>
@@ -67,4 +67,5 @@
6767
<org.apache.spark.spark-sql.version>3.4.0</org.apache.spark.spark-sql.version>
6868
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
6969
</properties>
70+
7071
</project>

‎apollo/pom.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>apolllo</artifactId>
6+
<artifactId>apollo</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<name>apollo</name>
@@ -17,11 +17,10 @@
1717
</parent>
1818

1919
<dependencies>
20-
<dependency>
21-
<groupId>org.springframework.boot</groupId>
22-
<artifactId>spring-boot-starter-web</artifactId>
23-
</dependency>
24-
20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-starter-web</artifactId>
23+
</dependency>
2524
<dependency>
2625
<groupId>com.ctrip.framework.apollo</groupId>
2726
<artifactId>apollo-client</artifactId>

‎jts/pom.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,16 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5+
<artifactId>jst</artifactId>
6+
<version>1.0-SNAPSHOT</version>
7+
<packaging>jar</packaging>
58

69
<parent>
710
<groupId>com.baeldung</groupId>
811
<artifactId>parent-modules</artifactId>
912
<version>1.0.0-SNAPSHOT</version>
1013
</parent>
1114

12-
<groupId>com.baeldung.jts</groupId>
13-
<artifactId>jst-example</artifactId>
14-
<version>1.0-SNAPSHOT</version>
15-
<packaging>jar</packaging>
16-
17-
<properties>
18-
<maven.compiler.source>21</maven.compiler.source> <!-- Java version -->
19-
<maven.compiler.target>21</maven.compiler.target>
20-
<slf4j.version>2.0.17</slf4j.version>
21-
<junit.version>4.13.2</junit.version>
22-
<jts.version>1.20.0</jts.version>
23-
<qos.logback.version>1.5.18</qos.logback.version>
24-
<maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
25-
<maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
26-
</properties>
2715
<dependencies>
2816
<dependency>
2917
<groupId>org.locationtech.jts</groupId>
@@ -90,4 +78,16 @@
9078
</plugin>
9179
</plugins>
9280
</build>
81+
82+
<properties>
83+
<maven.compiler.source>21</maven.compiler.source> <!-- Java version -->
84+
<maven.compiler.target>21</maven.compiler.target>
85+
<slf4j.version>2.0.17</slf4j.version>
86+
<junit.version>4.13.2</junit.version>
87+
<jts.version>1.20.0</jts.version>
88+
<qos.logback.version>1.5.18</qos.logback.version>
89+
<maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
90+
<maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
91+
</properties>
92+
9393
</project>

‎maven-modules/maven-plugin-management/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>plugin-management</artifactId>
6+
<artifactId>maven-plugin-management</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
99

‎maven-modules/maven-plugin-management/submodule-1/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>submodule-1</artifactId>
77

88
<parent>
9-
<artifactId>plugin-management</artifactId>
9+
<artifactId>maven-plugin-management</artifactId>
1010
<groupId>com.baeldung</groupId>
1111
<version>1.0.0-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>

‎maven-modules/maven-plugin-management/submodule-2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>submodule-2</artifactId>
77

88
<parent>
9-
<artifactId>plugin-management</artifactId>
9+
<artifactId>maven-plugin-management</artifactId>
1010
<groupId>com.baeldung</groupId>
1111
<version>1.0.0-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>

‎messaging-modules/apache-camel-kserve/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>apache-camel-kserve</artifactId>
67
<packaging>pom</packaging>
78

89
<parent>
@@ -11,9 +12,8 @@
1112
<version>0.0.1-SNAPSHOT</version>
1213
</parent>
1314

14-
<artifactId>sentiment-parent-pom</artifactId>
15-
1615
<modules>
1716
<module>sentiment-service</module>
1817
</modules>
18+
1919
</project>

‎messaging-modules/apache-camel-kserve/sentiment-service/pom.xml‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,25 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>sentiment-service</artifactId>
7+
<name>sentiment-service</name>
8+
<description>This is the main service of the system, that uses Apache Camel to integrate with Triton server and
9+
use an AI model for inference
10+
</description>
611

712
<parent>
813
<groupId>com.baeldung</groupId>
9-
<artifactId>sentiment-parent-pom</artifactId>
14+
<artifactId>apache-camel-kserve</artifactId>
1015
<version>0.0.1-SNAPSHOT</version>
1116
</parent>
1217

13-
<name>Sentiment System - Service</name>
14-
<description>This is the main service of the system, that uses Apache Camel to integrate with Triton server and
15-
use an AI model for inference</description>
16-
<artifactId>sentiment-service</artifactId>
17-
18-
<properties>
19-
<java.version>21</java.version>
20-
<maven.compiler.source>${java.version}</maven.compiler.source>
21-
<maven.compiler.release>${java.version}</maven.compiler.release>
22-
<maven.compiler.target>${java.version}</maven.compiler.target>
23-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
25-
<camel.version>4.13.0</camel.version>
26-
<jackson-databind.version>2.19.2</jackson-databind.version>
27-
<tokenizers.version>0.21.0</tokenizers.version>
28-
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
29-
</properties>
30-
3118
<dependencies>
3219
<!-- Core Camel -->
3320
<dependency>
3421
<groupId>org.apache.camel</groupId>
3522
<artifactId>camel-main</artifactId>
3623
<version>${camel.version}</version>
3724
</dependency>
38-
3925
<!-- REST support via Undertow -->
4026
<dependency>
4127
<groupId>org.apache.camel</groupId>
@@ -47,21 +33,18 @@
4733
<artifactId>camel-rest</artifactId>
4834
<version>${camel.version}</version>
4935
</dependency>
50-
5136
<!-- KServe inference component -->
5237
<dependency>
5338
<groupId>org.apache.camel</groupId>
5439
<artifactId>camel-kserve</artifactId>
5540
<version>${camel.version}</version>
5641
</dependency>
57-
5842
<!-- JSON support -->
5943
<dependency>
6044
<groupId>com.fasterxml.jackson.core</groupId>
6145
<artifactId>jackson-databind</artifactId>
6246
<version>${jackson-databind.version}</version>
6347
</dependency>
64-
6548
<!-- lib to use for tokenizer -->
6649
<dependency>
6750
<groupId>ai.djl.huggingface</groupId>
@@ -91,7 +74,9 @@
9174
<executions>
9275
<execution>
9376
<phase>package</phase>
94-
<goals><goal>shade</goal></goals>
77+
<goals>
78+
<goal>shade</goal>
79+
</goals>
9580
<configuration>
9681
<transformers>
9782
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -105,4 +90,18 @@
10590
</plugin>
10691
</plugins>
10792
</build>
93+
94+
<properties>
95+
<java.version>21</java.version>
96+
<maven.compiler.source>${java.version}</maven.compiler.source>
97+
<maven.compiler.release>${java.version}</maven.compiler.release>
98+
<maven.compiler.target>${java.version}</maven.compiler.target>
99+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
100+
101+
<camel.version>4.13.0</camel.version>
102+
<jackson-databind.version>2.19.2</jackson-databind.version>
103+
<tokenizers.version>0.21.0</tokenizers.version>
104+
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
105+
</properties>
106+
108107
</project>

‎spring-boot-rest-simple/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.baeldung.web</groupId>
7-
<artifactId>spring-boot-simple</artifactId>
7+
<artifactId>spring-boot-rest-simple</artifactId>
88
<name>spring-boot-rest-simple</name>
99
<packaging>war</packaging>
1010
<description>Spring Boot Rest Module</description>

0 commit comments

Comments
 (0)