Skip to content

Commit 0c712a5

Browse files
daniel-kmiecikdaniel-kmiecik
authored
fix: update workflow (#12628)
1 parent ad613ba commit 0c712a5

File tree

3 files changed

+156
-160
lines changed

3 files changed

+156
-160
lines changed

‎.github/workflows/maven-master-pulls.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
restore-keys: |
3131
${{ runner.os }}-maven-
3232
- name: Build with Maven
33-
run: mvn -B -U verify --file pom.xml
33+
run: mvn -B -U install --file pom.xml
3434

3535
- name: Check local context
3636
run: |
@@ -80,4 +80,4 @@ jobs:
8080
restore-keys: |
8181
${{ runner.os }}-maven-
8282
- name: Build with Maven
83-
run: mvn -B -U clean verify -DskipTests -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Psamples-java8 --file pom.xml
83+
run: mvn -B -U clean install -DskipTests -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Psamples-java8 --file pom.xml

‎samples/server/petstore/java-vertx/async/pom.xml‎

Lines changed: 77 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,89 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>io.swagger</groupId>
6-
<artifactId>swagger-java-vertx-server</artifactId>
7-
<version>1.0.0-SNAPSHOT</version>
8-
<packaging>jar</packaging>
5+
<groupId>io.swagger</groupId>
6+
<artifactId>swagger-java-vertx-server</artifactId>
7+
<version>1.0.0-SNAPSHOT</version>
8+
<packaging>jar</packaging>
99

10-
<name>Swagger Petstore</name>
10+
<name>Swagger Petstore</name>
1111

12-
<properties>
13-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<java.version>1.8</java.version>
15-
<junit.version>4.12</junit.version>
16-
<vertx.version>3.4.1</vertx.version>
17-
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
18-
<vertx-swagger-router.version>1.2.0</vertx-swagger-router.version>
19-
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
20-
<jackson-datatype-jsr310.version>2.11.4</jackson-datatype-jsr310.version>
21-
</properties>
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
<java.version>1.8</java.version>
15+
<junit.version>4.12</junit.version>
16+
<vertx.version>3.4.1</vertx.version>
17+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
18+
<vertx-swagger-router.version>1.2.0</vertx-swagger-router.version>
19+
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
20+
<jackson-datatype-jsr310.version>2.11.4</jackson-datatype-jsr310.version>
21+
</properties>
2222

23-
<dependencies>
24-
<dependency>
25-
<groupId>junit</groupId>
26-
<artifactId>junit</artifactId>
27-
<version>${junit.version}</version>
28-
<scope>test</scope>
29-
</dependency>
23+
<dependencies>
24+
<dependency>
25+
<groupId>junit</groupId>
26+
<artifactId>junit</artifactId>
27+
<version>${junit.version}</version>
28+
<scope>test</scope>
29+
</dependency>
3030

31-
<dependency>
32-
<groupId>io.vertx</groupId>
33-
<artifactId>vertx-unit</artifactId>
34-
<version>${vertx.version}</version>
35-
<scope>test</scope>
36-
</dependency>
31+
<dependency>
32+
<groupId>io.vertx</groupId>
33+
<artifactId>vertx-unit</artifactId>
34+
<version>${vertx.version}</version>
35+
<scope>test</scope>
36+
</dependency>
3737

38-
<dependency>
39-
<groupId>com.github.phiz71</groupId>
40-
<artifactId>vertx-swagger-router</artifactId>
41-
<version>${vertx-swagger-router.version}</version>
42-
</dependency>
38+
<dependency>
39+
<groupId>com.github.phiz71</groupId>
40+
<artifactId>vertx-swagger-router</artifactId>
41+
<version>${vertx-swagger-router.version}</version>
42+
</dependency>
4343

44-
<dependency>
45-
<groupId>com.fasterxml.jackson.datatype</groupId>
46-
<artifactId>jackson-datatype-jsr310</artifactId>
47-
<version>${jackson-datatype-jsr310.version}</version>
48-
</dependency>
44+
<dependency>
45+
<groupId>com.fasterxml.jackson.datatype</groupId>
46+
<artifactId>jackson-datatype-jsr310</artifactId>
47+
<version>${jackson-datatype-jsr310.version}</version>
48+
</dependency>
4949

50-
</dependencies>
50+
</dependencies>
5151

52-
<build>
53-
<plugins>
54-
<plugin>
55-
<artifactId>maven-compiler-plugin</artifactId>
56-
<version>${maven-compiler-plugin.version}</version>
57-
<configuration>
58-
<source>${java.version}</source>
59-
<target>${java.version}</target>
60-
</configuration>
61-
</plugin>
52+
<build>
53+
<plugins>
54+
<plugin>
55+
<artifactId>maven-compiler-plugin</artifactId>
56+
<version>${maven-compiler-plugin.version}</version>
57+
<configuration>
58+
<source>${java.version}</source>
59+
<target>${java.version}</target>
60+
</configuration>
61+
</plugin>
6262

63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-shade-plugin</artifactId>
66-
<version>${maven-shade-plugin.version}</version>
67-
<executions>
68-
<execution>
69-
<phase>package</phase>
70-
<goals>
71-
<goal>shade</goal>
72-
</goals>
73-
<configuration>
74-
<transformers>
75-
<transformer
76-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
77-
<manifestEntries>
78-
<Main-Class>io.vertx.core.Starter</Main-Class>
79-
<Main-Verticle>io.swagger.server.api.MainApiVerticle</Main-Verticle>
80-
</manifestEntries>
81-
</transformer>
82-
</transformers>
83-
<artifactSet />
84-
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
85-
</configuration>
86-
</execution>
87-
</executions>
88-
</plugin>
89-
</plugins>
90-
</build>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-shade-plugin</artifactId>
66+
<version>${maven-shade-plugin.version}</version>
67+
<executions>
68+
<execution>
69+
<phase>package</phase>
70+
<goals>
71+
<goal>shade</goal>
72+
</goals>
73+
<configuration>
74+
<transformers>
75+
<transformer
76+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
77+
<mainClass>io.swagger.server.api.MainApiVerticle</mainClass>
78+
</transformer>
79+
</transformers>
80+
<artifactSet/>
81+
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar
82+
</outputFile>
83+
</configuration>
84+
</execution>
85+
</executions>
86+
</plugin>
87+
</plugins>
88+
</build>
9189
</project>

‎samples/server/petstore/java-vertx/rx/pom.xml‎

Lines changed: 77 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,89 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>io.swagger</groupId>
6-
<artifactId>swagger-java-vertx-rx-server</artifactId>
7-
<version>1.0.0-SNAPSHOT</version>
8-
<packaging>jar</packaging>
5+
<groupId>io.swagger</groupId>
6+
<artifactId>swagger-java-vertx-rx-server</artifactId>
7+
<version>1.0.0-SNAPSHOT</version>
8+
<packaging>jar</packaging>
99

10-
<name>Swagger Petstore</name>
10+
<name>Swagger Petstore</name>
1111

12-
<properties>
13-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<java.version>1.8</java.version>
15-
<junit.version>4.12</junit.version>
16-
<vertx.version>3.4.1</vertx.version>
17-
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
18-
<vertx-swagger-router.version>1.2.0</vertx-swagger-router.version>
19-
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
20-
<jackson-datatype-jsr310.version>2.11.4</jackson-datatype-jsr310.version>
21-
</properties>
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
<java.version>1.8</java.version>
15+
<junit.version>4.12</junit.version>
16+
<vertx.version>3.4.1</vertx.version>
17+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
18+
<vertx-swagger-router.version>1.2.0</vertx-swagger-router.version>
19+
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
20+
<jackson-datatype-jsr310.version>2.11.4</jackson-datatype-jsr310.version>
21+
</properties>
2222

23-
<dependencies>
24-
<dependency>
25-
<groupId>junit</groupId>
26-
<artifactId>junit</artifactId>
27-
<version>${junit.version}</version>
28-
<scope>test</scope>
29-
</dependency>
23+
<dependencies>
24+
<dependency>
25+
<groupId>junit</groupId>
26+
<artifactId>junit</artifactId>
27+
<version>${junit.version}</version>
28+
<scope>test</scope>
29+
</dependency>
3030

31-
<dependency>
32-
<groupId>io.vertx</groupId>
33-
<artifactId>vertx-unit</artifactId>
34-
<version>${vertx.version}</version>
35-
<scope>test</scope>
36-
</dependency>
31+
<dependency>
32+
<groupId>io.vertx</groupId>
33+
<artifactId>vertx-unit</artifactId>
34+
<version>${vertx.version}</version>
35+
<scope>test</scope>
36+
</dependency>
3737

38-
<dependency>
39-
<groupId>com.github.phiz71</groupId>
40-
<artifactId>vertx-swagger-router</artifactId>
41-
<version>${vertx-swagger-router.version}</version>
42-
</dependency>
38+
<dependency>
39+
<groupId>com.github.phiz71</groupId>
40+
<artifactId>vertx-swagger-router</artifactId>
41+
<version>${vertx-swagger-router.version}</version>
42+
</dependency>
4343

44-
<dependency>
45-
<groupId>com.fasterxml.jackson.datatype</groupId>
46-
<artifactId>jackson-datatype-jsr310</artifactId>
47-
<version>${jackson-datatype-jsr310.version}</version>
48-
</dependency>
44+
<dependency>
45+
<groupId>com.fasterxml.jackson.datatype</groupId>
46+
<artifactId>jackson-datatype-jsr310</artifactId>
47+
<version>${jackson-datatype-jsr310.version}</version>
48+
</dependency>
4949

50-
</dependencies>
50+
</dependencies>
5151

52-
<build>
53-
<plugins>
54-
<plugin>
55-
<artifactId>maven-compiler-plugin</artifactId>
56-
<version>${maven-compiler-plugin.version}</version>
57-
<configuration>
58-
<source>${java.version}</source>
59-
<target>${java.version}</target>
60-
</configuration>
61-
</plugin>
52+
<build>
53+
<plugins>
54+
<plugin>
55+
<artifactId>maven-compiler-plugin</artifactId>
56+
<version>${maven-compiler-plugin.version}</version>
57+
<configuration>
58+
<source>${java.version}</source>
59+
<target>${java.version}</target>
60+
</configuration>
61+
</plugin>
6262

63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-shade-plugin</artifactId>
66-
<version>${maven-shade-plugin.version}</version>
67-
<executions>
68-
<execution>
69-
<phase>package</phase>
70-
<goals>
71-
<goal>shade</goal>
72-
</goals>
73-
<configuration>
74-
<transformers>
75-
<transformer
76-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
77-
<manifestEntries>
78-
<Main-Class>io.vertx.core.Starter</Main-Class>
79-
<Main-Verticle>io.swagger.server.api.MainApiVerticle</Main-Verticle>
80-
</manifestEntries>
81-
</transformer>
82-
</transformers>
83-
<artifactSet />
84-
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
85-
</configuration>
86-
</execution>
87-
</executions>
88-
</plugin>
89-
</plugins>
90-
</build>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-shade-plugin</artifactId>
66+
<version>${maven-shade-plugin.version}</version>
67+
<executions>
68+
<execution>
69+
<phase>package</phase>
70+
<goals>
71+
<goal>shade</goal>
72+
</goals>
73+
<configuration>
74+
<transformers>
75+
<transformer
76+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
77+
<mainClass>io.swagger.server.api.MainApiVerticle</mainClass>
78+
</transformer>
79+
</transformers>
80+
<artifactSet/>
81+
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar
82+
</outputFile>
83+
</configuration>
84+
</execution>
85+
</executions>
86+
</plugin>
87+
</plugins>
88+
</build>
9189
</project>

0 commit comments

Comments
 (0)