Skip to content

Commit b63f0c2

Browse files
mkoubamkouba
authored
Merge pull request #1812 from gsmet/fix-fault-tolerance
Fix fault tolerance dependencies
2 parents e5ce39b + 3b6779e commit b63f0c2

File tree

2 files changed

+106
-106
lines changed

2 files changed

+106
-106
lines changed

‎extensions/smallrye-fault-tolerance/deployment/pom.xml‎

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -14,59 +14,57 @@
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
1616
-->
17-
1817
<project xmlns="http://maven.apache.org/POM/4.0.0"
19-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<parent>
22-
<artifactId>quarkus-smallrye-fault-tolerance-parent</artifactId>
23-
<groupId>io.quarkus</groupId>
24-
<version>999-SNAPSHOT</version>
25-
<relativePath>../</relativePath>
26-
</parent>
27-
<modelVersion>4.0.0</modelVersion>
28-
29-
<artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
30-
<name>Quarkus - SmallRye Fault tolerance - Deployment</name>
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<parent>
21+
<artifactId>quarkus-smallrye-fault-tolerance-parent</artifactId>
22+
<groupId>io.quarkus</groupId>
23+
<version>999-SNAPSHOT</version>
24+
<relativePath>../</relativePath>
25+
</parent>
26+
<modelVersion>4.0.0</modelVersion>
3127

32-
<dependencies>
33-
<dependency>
34-
<groupId>io.quarkus</groupId>
35-
<artifactId>quarkus-core-deployment</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>io.quarkus</groupId>
39-
<artifactId>quarkus-arc-deployment</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>io.quarkus</groupId>
43-
<artifactId>quarkus-smallrye-metrics-deployment</artifactId>
44-
</dependency>
45-
<dependency>
46-
<groupId>io.quarkus</groupId>
47-
<artifactId>quarkus-smallrye-fault-tolerance</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.oracle.substratevm</groupId>
51-
<artifactId>svm</artifactId>
52-
</dependency>
53-
</dependencies>
28+
<artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
29+
<name>Quarkus - SmallRye Fault tolerance - Deployment</name>
5430

55-
<build>
56-
<plugins>
57-
<plugin>
58-
<artifactId>maven-compiler-plugin</artifactId>
59-
<configuration>
60-
<annotationProcessorPaths>
61-
<path>
62-
<groupId>io.quarkus</groupId>
63-
<artifactId>quarkus-extension-processor</artifactId>
64-
<version>${project.version}</version>
65-
</path>
66-
</annotationProcessorPaths>
67-
</configuration>
68-
</plugin>
69-
</plugins>
70-
</build>
31+
<dependencies>
32+
<dependency>
33+
<groupId>io.quarkus</groupId>
34+
<artifactId>quarkus-core-deployment</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>io.quarkus</groupId>
38+
<artifactId>quarkus-arc-deployment</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>io.quarkus</groupId>
42+
<artifactId>quarkus-smallrye-metrics-deployment</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>io.quarkus</groupId>
46+
<artifactId>quarkus-smallrye-fault-tolerance</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>com.oracle.substratevm</groupId>
50+
<artifactId>svm</artifactId>
51+
</dependency>
52+
</dependencies>
7153

54+
<build>
55+
<plugins>
56+
<plugin>
57+
<artifactId>maven-compiler-plugin</artifactId>
58+
<configuration>
59+
<annotationProcessorPaths>
60+
<path>
61+
<groupId>io.quarkus</groupId>
62+
<artifactId>quarkus-extension-processor</artifactId>
63+
<version>${project.version}</version>
64+
</path>
65+
</annotationProcessorPaths>
66+
</configuration>
67+
</plugin>
68+
</plugins>
69+
</build>
7270
</project>

‎extensions/smallrye-fault-tolerance/runtime/pom.xml‎

Lines changed: 57 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -14,63 +14,65 @@
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
1616
-->
17-
1817
<project xmlns="http://maven.apache.org/POM/4.0.0"
19-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<parent>
22-
<artifactId>quarkus-smallrye-fault-tolerance-parent</artifactId>
23-
<groupId>io.quarkus</groupId>
24-
<version>999-SNAPSHOT</version>
25-
<relativePath>../</relativePath>
26-
</parent>
27-
<modelVersion>4.0.0</modelVersion>
28-
29-
<artifactId>quarkus-smallrye-fault-tolerance</artifactId>
30-
<name>Quarkus - SmallRye Fault tolerance - Runtime</name>
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<parent>
21+
<artifactId>quarkus-smallrye-fault-tolerance-parent</artifactId>
22+
<groupId>io.quarkus</groupId>
23+
<version>999-SNAPSHOT</version>
24+
<relativePath>../</relativePath>
25+
</parent>
26+
<modelVersion>4.0.0</modelVersion>
3127

32-
<dependencies>
33-
<dependency>
34-
<groupId>io.quarkus</groupId>
35-
<artifactId>quarkus-core</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>io.smallrye</groupId>
39-
<artifactId>smallrye-fault-tolerance</artifactId>
40-
<exclusions>
41-
<!-- Temporary fix for dependency convergence error -->
42-
<!-- Current smallrye-metrics version depends on 1.1 -->
43-
<exclusion>
44-
<groupId>org.eclipse.microprofile.metrics</groupId>
45-
<artifactId>microprofile-metrics-api</artifactId>
46-
</exclusion>
47-
</exclusions>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.oracle.substratevm</groupId>
51-
<artifactId>svm</artifactId>
52-
</dependency>
53-
</dependencies>
28+
<artifactId>quarkus-smallrye-fault-tolerance</artifactId>
29+
<name>Quarkus - SmallRye Fault tolerance - Runtime</name>
5430

55-
<build>
56-
<plugins>
57-
<plugin>
58-
<groupId>io.quarkus.bootstrap</groupId>
59-
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
60-
</plugin>
61-
<plugin>
62-
<artifactId>maven-compiler-plugin</artifactId>
63-
<configuration>
64-
<annotationProcessorPaths>
65-
<path>
66-
<groupId>io.quarkus</groupId>
67-
<artifactId>quarkus-extension-processor</artifactId>
68-
<version>${project.version}</version>
69-
</path>
70-
</annotationProcessorPaths>
71-
</configuration>
72-
</plugin>
73-
</plugins>
74-
</build>
31+
<dependencies>
32+
<dependency>
33+
<groupId>io.quarkus</groupId>
34+
<artifactId>quarkus-core</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>io.smallrye</groupId>
38+
<artifactId>smallrye-fault-tolerance</artifactId>
39+
<exclusions>
40+
<!-- Temporary fix for dependency convergence error -->
41+
<!-- Current smallrye-metrics version depends on 1.1 -->
42+
<exclusion>
43+
<groupId>org.eclipse.microprofile.metrics</groupId>
44+
<artifactId>microprofile-metrics-api</artifactId>
45+
</exclusion>
46+
</exclusions>
47+
</dependency>
48+
<dependency>
49+
<groupId>io.quarkus</groupId>
50+
<artifactId>quarkus-smallrye-metrics</artifactId>
51+
</dependency>
52+
<dependency>
53+
<groupId>com.oracle.substratevm</groupId>
54+
<artifactId>svm</artifactId>
55+
</dependency>
56+
</dependencies>
7557

58+
<build>
59+
<plugins>
60+
<plugin>
61+
<groupId>io.quarkus.bootstrap</groupId>
62+
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
63+
</plugin>
64+
<plugin>
65+
<artifactId>maven-compiler-plugin</artifactId>
66+
<configuration>
67+
<annotationProcessorPaths>
68+
<path>
69+
<groupId>io.quarkus</groupId>
70+
<artifactId>quarkus-extension-processor</artifactId>
71+
<version>${project.version}</version>
72+
</path>
73+
</annotationProcessorPaths>
74+
</configuration>
75+
</plugin>
76+
</plugins>
77+
</build>
7678
</project>

0 commit comments

Comments
 (0)