Skip to content

Commit 46caf35

Browse files
salvatore-coppolasalvatore-coppola
authored
fix(ai.server.triton): Updated protobuf-java-util to version 3.25.6 (#5750)
Updated protobuf-java-util to version 3.25.6
1 parent 4f1bcc5 commit 46caf35

3 files changed

Lines changed: 128 additions & 123 deletions

File tree

‎kura/org.eclipse.kura.ai.triton.server/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: org.eclipse.kura.ai.triton.server
44
Bundle-SymbolicName: org.eclipse.kura.ai.triton.server;singleton:=true
55
Bundle-Version: 2.0.0.qualifier
66
Bundle-Vendor: Eclipse Kura
7-
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
7+
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
88
Service-Component: OSGI-INF/*.xml
99
Bundle-ClassPath: .,
1010
lib/grpc-api.jar,

‎kura/org.eclipse.kura.ai.triton.server/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../test/org.eclipse.kura.ai.triton.server.test/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
3232
<grpc.version>1.68.2</grpc.version>
3333
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
34-
<protoc.version>3.12.0</protoc.version>
34+
<protoc.version>3.25.6</protoc.version>
35+
<protobuf-java-util.version>3.25.6</protobuf-java-util.version>
3536
</properties>
3637

3738
<build>
@@ -90,7 +91,7 @@
9091
<artifactItem>
9192
<groupId>com.google.protobuf</groupId>
9293
<artifactId>protobuf-java-util</artifactId>
93-
<version>3.25.3</version>
94+
<version>${protobuf-java-util.version}</version>
9495
</artifactItem>
9596
</artifactItems>
9697
</configuration>

‎kura/test/org.eclipse.kura.ai.triton.server.test/pom.xml‎

Lines changed: 124 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -13,132 +13,136 @@
1313
Eurotech
1414
1515
-->
16-
<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">
17-
<modelVersion>4.0.0</modelVersion>
16+
<project xmlns="http://maven.apache.org/POM/4.0.0"
17+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
<modelVersion>4.0.0</modelVersion>
1820

19-
<parent>
20-
<groupId>org.eclipse.kura</groupId>
21-
<artifactId>test</artifactId>
22-
<version>6.0.0-SNAPSHOT</version>
23-
</parent>
21+
<parent>
22+
<groupId>org.eclipse.kura</groupId>
23+
<artifactId>test</artifactId>
24+
<version>6.0.0-SNAPSHOT</version>
25+
</parent>
2426

25-
<artifactId>org.eclipse.kura.ai.triton.server.test</artifactId>
26-
<packaging>eclipse-test-plugin</packaging>
27+
<artifactId>org.eclipse.kura.ai.triton.server.test</artifactId>
28+
<packaging>eclipse-test-plugin</packaging>
2729

28-
<properties>
29-
<kura.basedir>${project.basedir}/../..</kura.basedir>
30-
<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
31-
</properties>
30+
<properties>
31+
<kura.basedir>${project.basedir}/../..</kura.basedir>
32+
<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
33+
<grpc.version>1.68.2</grpc.version>
34+
<protobuf-java-util.version>3.25.6</protobuf-java-util.version>
35+
</properties>
3236

33-
<dependencies>
34-
<dependency>
35-
<groupId>io.grpc</groupId>
36-
<artifactId>grpc-testing</artifactId>
37-
<version>1.56.1</version>
38-
<scope>test</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>io.grpc</groupId>
42-
<artifactId>grpc-api</artifactId>
43-
<version>1.56.1</version>
44-
</dependency>
45-
<dependency>
46-
<groupId>io.grpc</groupId>
47-
<artifactId>grpc-context</artifactId>
48-
<version>1.56.1</version>
49-
</dependency>
50-
<dependency>
51-
<groupId>io.grpc</groupId>
52-
<artifactId>grpc-core</artifactId>
53-
<version>1.56.1</version>
54-
</dependency>
55-
<dependency>
56-
<groupId>io.grpc</groupId>
57-
<artifactId>grpc-netty-shaded</artifactId>
58-
<version>1.56.1</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>io.grpc</groupId>
62-
<artifactId>grpc-protobuf</artifactId>
63-
<version>1.56.1</version>
64-
</dependency>
65-
<dependency>
66-
<groupId>io.grpc</groupId>
67-
<artifactId>grpc-protobuf-lite</artifactId>
68-
<version>1.56.1</version>
69-
</dependency>
70-
<dependency>
71-
<groupId>io.grpc</groupId>
72-
<artifactId>grpc-stub</artifactId>
73-
<version>1.56.1</version>
74-
</dependency>
75-
<dependency>
76-
<groupId>io.perfmark</groupId>
77-
<artifactId>perfmark-api</artifactId>
78-
<version>0.26.0</version>
79-
</dependency>
80-
<dependency>
37+
<dependencies>
38+
<dependency>
39+
<groupId>io.grpc</groupId>
40+
<artifactId>grpc-testing</artifactId>
41+
<version>${grpc.version}</version>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>io.grpc</groupId>
46+
<artifactId>grpc-api</artifactId>
47+
<version>${grpc.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>io.grpc</groupId>
51+
<artifactId>grpc-context</artifactId>
52+
<version>${grpc.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>io.grpc</groupId>
56+
<artifactId>grpc-core</artifactId>
57+
<version>${grpc.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>io.grpc</groupId>
61+
<artifactId>grpc-netty-shaded</artifactId>
62+
<version>${grpc.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>io.grpc</groupId>
66+
<artifactId>grpc-protobuf</artifactId>
67+
<version>${grpc.version}</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>io.grpc</groupId>
71+
<artifactId>grpc-protobuf-lite</artifactId>
72+
<version>${grpc.version}</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>io.grpc</groupId>
76+
<artifactId>grpc-stub</artifactId>
77+
<version>${grpc.version}</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>io.perfmark</groupId>
81+
<artifactId>perfmark-api</artifactId>
82+
<version>0.26.0</version>
83+
</dependency>
84+
<dependency>
8185
<groupId>com.google.protobuf</groupId>
8286
<artifactId>protobuf-java-util</artifactId>
83-
<version>3.25.3</version>
87+
<version>${protobuf-java-util.version}</version>
8488
</dependency>
85-
</dependencies>
89+
</dependencies>
8690

87-
<build>
88-
<plugins>
89-
<plugin>
90-
<groupId>org.jacoco</groupId>
91-
<artifactId>jacoco-maven-plugin</artifactId>
92-
</plugin>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-dependency-plugin</artifactId>
96-
<version>3.0.0</version>
97-
<executions>
98-
<execution>
99-
<phase>generate-sources</phase>
100-
<configuration>
101-
<outputDirectory>${project.basedir}/lib</outputDirectory>
102-
<stripVersion>true</stripVersion>
103-
<artifactItems>
104-
<artifactItem>
105-
<groupId>io.grpc</groupId>
106-
<artifactId>grpc-testing</artifactId>
107-
<version>1.56.1</version>
108-
</artifactItem>
109-
</artifactItems>
110-
</configuration>
111-
<goals>
112-
<goal>copy</goal>
113-
</goals>
114-
</execution>
115-
</executions>
116-
</plugin>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-compiler-plugin</artifactId>
120-
<executions>
121-
<execution>
122-
<id>compiletests</id>
123-
<phase>test-compile</phase>
124-
<goals>
125-
<goal>testCompile</goal>
126-
</goals>
127-
</execution>
128-
</executions>
129-
</plugin>
130-
<plugin>
131-
<groupId>org.eclipse.tycho</groupId>
132-
<artifactId>tycho-surefire-plugin</artifactId>
133-
</plugin>
134-
<plugin>
135-
<groupId>org.apache.maven.plugins</groupId>
136-
<artifactId>maven-surefire-plugin</artifactId>
137-
</plugin>
138-
<plugin>
139-
<groupId>org.eclipse.tycho</groupId>
140-
<artifactId>target-platform-configuration</artifactId>
141-
</plugin>
142-
</plugins>
143-
</build>
91+
<build>
92+
<plugins>
93+
<plugin>
94+
<groupId>org.jacoco</groupId>
95+
<artifactId>jacoco-maven-plugin</artifactId>
96+
</plugin>
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-dependency-plugin</artifactId>
100+
<version>3.0.0</version>
101+
<executions>
102+
<execution>
103+
<phase>generate-sources</phase>
104+
<configuration>
105+
<outputDirectory>${project.basedir}/lib</outputDirectory>
106+
<stripVersion>true</stripVersion>
107+
<artifactItems>
108+
<artifactItem>
109+
<groupId>io.grpc</groupId>
110+
<artifactId>grpc-testing</artifactId>
111+
<version>${grpc.version}</version>
112+
</artifactItem>
113+
</artifactItems>
114+
</configuration>
115+
<goals>
116+
<goal>copy</goal>
117+
</goals>
118+
</execution>
119+
</executions>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-compiler-plugin</artifactId>
124+
<executions>
125+
<execution>
126+
<id>compiletests</id>
127+
<phase>test-compile</phase>
128+
<goals>
129+
<goal>testCompile</goal>
130+
</goals>
131+
</execution>
132+
</executions>
133+
</plugin>
134+
<plugin>
135+
<groupId>org.eclipse.tycho</groupId>
136+
<artifactId>tycho-surefire-plugin</artifactId>
137+
</plugin>
138+
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140+
<artifactId>maven-surefire-plugin</artifactId>
141+
</plugin>
142+
<plugin>
143+
<groupId>org.eclipse.tycho</groupId>
144+
<artifactId>target-platform-configuration</artifactId>
145+
</plugin>
146+
</plugins>
147+
</build>
144148
</project>

0 commit comments

Comments
 (0)