Skip to content

Commit 8238fab

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2833 from kubernetes-client/pom-19
Update pom for release-19 examples [cherrypick to release-19 branch]
2 parents 5d2fc41 + 17e6dc3 commit 8238fab

File tree

2 files changed

+48
-34
lines changed

2 files changed

+48
-34
lines changed

‎examples/examples-release-18/pom.xml

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24
<modelVersion>4.0.0</modelVersion>
35

46
<parent>
@@ -17,16 +19,16 @@
1719
<artifactId>logback-classic</artifactId>
1820
<scope>runtime</scope>
1921
</dependency>
20-
<dependency>
21-
<groupId>io.prometheus</groupId>
22-
<artifactId>simpleclient</artifactId>
23-
<version>0.15.0</version>
24-
</dependency>
25-
<dependency>
26-
<groupId>io.prometheus</groupId>
27-
<artifactId>simpleclient_httpserver</artifactId>
28-
<version>0.15.0</version>
29-
</dependency>
22+
<dependency>
23+
<groupId>io.prometheus</groupId>
24+
<artifactId>simpleclient</artifactId>
25+
<version>0.15.0</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>io.prometheus</groupId>
29+
<artifactId>simpleclient_httpserver</artifactId>
30+
<version>0.15.0</version>
31+
</dependency>
3032
<dependency>
3133
<groupId>io.kubernetes</groupId>
3234
<artifactId>client-java-api</artifactId>
@@ -77,7 +79,8 @@
7779
<artifactId>wiremock</artifactId>
7880
<scope>test</scope>
7981
</dependency>
80-
<!--for spring controller example-->
82+
<!--for
83+
spring controller example-->
8184
<dependency>
8285
<groupId>org.springframework.boot</groupId>
8386
<artifactId>spring-boot-starter-web</artifactId>
@@ -93,14 +96,14 @@
9396

9497
<build>
9598
<plugins>
96-
<plugin>
97-
<groupId>org.sonatype.plugins</groupId>
98-
<artifactId>nexus-staging-maven-plugin</artifactId>
99-
<extensions>true</extensions>
100-
<configuration>
101-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
102-
</configuration>
103-
</plugin>
99+
<plugin>
100+
<groupId>org.sonatype.plugins</groupId>
101+
<artifactId>nexus-staging-maven-plugin</artifactId>
102+
<extensions>true</extensions>
103+
<configuration>
104+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
105+
</configuration>
106+
</plugin>
104107
<plugin>
105108
<groupId>org.apache.maven.plugins</groupId>
106109
<artifactId>maven-deploy-plugin</artifactId>
@@ -112,4 +115,4 @@
112115
</plugins>
113116
</build>
114117

115-
</project>
118+
</project>

‎examples/examples-release-19/pom.xml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24
<modelVersion>4.0.0</modelVersion>
35

46
<parent>
@@ -17,16 +19,16 @@
1719
<artifactId>logback-classic</artifactId>
1820
<scope>runtime</scope>
1921
</dependency>
20-
<dependency>
21-
<groupId>io.prometheus</groupId>
22-
<artifactId>simpleclient</artifactId>
23-
<version>0.15.0</version>
24-
</dependency>
25-
<dependency>
26-
<groupId>io.prometheus</groupId>
27-
<artifactId>simpleclient_httpserver</artifactId>
28-
<version>0.15.0</version>
29-
</dependency>
22+
<dependency>
23+
<groupId>io.prometheus</groupId>
24+
<artifactId>simpleclient</artifactId>
25+
<version>0.15.0</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>io.prometheus</groupId>
29+
<artifactId>simpleclient_httpserver</artifactId>
30+
<version>0.15.0</version>
31+
</dependency>
3032
<dependency>
3133
<groupId>io.kubernetes</groupId>
3234
<artifactId>client-java-api</artifactId>
@@ -77,7 +79,8 @@
7779
<artifactId>wiremock</artifactId>
7880
<scope>test</scope>
7981
</dependency>
80-
<!--for spring controller example-->
82+
<!--for
83+
spring controller example-->
8184
<dependency>
8285
<groupId>org.springframework.boot</groupId>
8386
<artifactId>spring-boot-starter-web</artifactId>
@@ -93,6 +96,14 @@
9396

9497
<build>
9598
<plugins>
99+
<plugin>
100+
<groupId>org.sonatype.plugins</groupId>
101+
<artifactId>nexus-staging-maven-plugin</artifactId>
102+
<extensions>true</extensions>
103+
<configuration>
104+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
105+
</configuration>
106+
</plugin>
96107
<plugin>
97108
<groupId>org.apache.maven.plugins</groupId>
98109
<artifactId>maven-deploy-plugin</artifactId>
@@ -104,4 +115,4 @@
104115
</plugins>
105116
</build>
106117

107-
</project>
118+
</project>

0 commit comments

Comments
 (0)