Skip to content

Commit cf1ad40

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-client#2675 from loffing/fix-maven-warnings
Fix Maven build warnings and minor doc issues
2 parents 07e05ac + 8d04127 commit cf1ad40

7 files changed

Lines changed: 33 additions & 15 deletions

File tree

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This workflow will build a Java project with Maven
2-
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
2+
# For more information see: https://docs.github.com/actions/automating-builds-and-tests/building-and-testing-java-with-maven
33

44
name: build
55

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If you have any problem with the package or any suggestions, please file an [iss
1818
1. Submit an issue describing your proposed change to the repo.
1919
2. Fork this repo, develop and test your code changes.
2020
3. Submit a pull request.
21-
4. The bot will automatically assigns someone to review your PR. Check the full list of bot commands [here](https://prow.k8s.io/command-help).
21+
4. The bot will automatically assign someone to review your PR. Check the full list of bot commands [here](https://prow.k8s.io/command-help).
2222

2323
### Contact
2424
You can reach the maintainers of this project at [SIG API Machinery](https://github.com/kubernetes/community/tree/master/sig-api-machinery) or on the [#kubernetes-client](https://kubernetes.slack.com/messages/kubernetes-client) channel on the Kubernetes slack.

‎examples/examples-release-14/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export REPO_ROOT=/path/to/client-java/repo
66
cd ${REPO_ROOT}/
77
mvn install
88

9-
cd ${REPO_ROOT}/examples/examples-13
9+
cd ${REPO_ROOT}/examples/examples-14
1010
mvn compile
1111
mvn exec:java -Dexec.mainClass="io.kubernetes.client.examples.Example"
1212
```

‎examples/examples-release-15/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export REPO_ROOT=/path/to/client-java/repo
66
cd ${REPO_ROOT}/
77
mvn install
88

9-
cd ${REPO_ROOT}/examples/examples-13
9+
cd ${REPO_ROOT}/examples/examples-15
1010
mvn compile
1111
mvn exec:java -Dexec.mainClass="io.kubernetes.client.examples.Example"
1212
```

‎fluent-gen/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<name>client-java-fluent-gen</name>
77
<url>https://github.com/kubernetes-client/java</url>
88
<description>Client Java Fluent Generator</description>
9-
<prerequisites>
10-
<maven>2.2.0</maven>
11-
</prerequisites>
129

1310
<parent>
1411
<groupId>io.kubernetes</groupId>

‎kubernetes/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<name>client-java-api</name>
77
<url>https://github.com/kubernetes-client/java</url>
88
<description>Swagger Java</description>
9-
<prerequisites>
10-
<maven>2.2.0</maven>
11-
</prerequisites>
129

1310
<parent>
1411
<groupId>io.kubernetes</groupId>

‎pom.xml‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<tag>HEAD</tag>
3131
</scm>
3232

33-
<prerequisites>
34-
<maven>2.2.0</maven>
35-
</prerequisites>
36-
3733
<properties>
3834
<java.version>1.8</java.version>
3935
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -392,6 +388,16 @@
392388
<artifactId>gmavenplus-plugin</artifactId>
393389
<version>3.0.0</version>
394390
</plugin>
391+
<plugin>
392+
<groupId>org.jacoco</groupId>
393+
<artifactId>jacoco-maven-plugin</artifactId>
394+
<version>0.8.10</version>
395+
</plugin>
396+
<plugin>
397+
<groupId>org.apache.maven.plugins</groupId>
398+
<artifactId>maven-enforcer-plugin</artifactId>
399+
<version>3.3.0</version>
400+
</plugin>
395401
</plugins>
396402
</pluginManagement>
397403
<plugins>
@@ -536,6 +542,25 @@ limitations under the License.
536542
</licenseHeader>
537543
</configuration>
538544
</plugin>
545+
<plugin>
546+
<groupId>org.apache.maven.plugins</groupId>
547+
<artifactId>maven-enforcer-plugin</artifactId>
548+
<executions>
549+
<execution>
550+
<id>enforce-maven</id>
551+
<goals>
552+
<goal>enforce</goal>
553+
</goals>
554+
<configuration>
555+
<rules>
556+
<requireMavenVersion>
557+
<version>2.2.0</version>
558+
</requireMavenVersion>
559+
</rules>
560+
</configuration>
561+
</execution>
562+
</executions>
563+
</plugin>
539564
</plugins>
540565
</build>
541566

@@ -568,7 +593,6 @@ limitations under the License.
568593
<plugin>
569594
<groupId>org.jacoco</groupId>
570595
<artifactId>jacoco-maven-plugin</artifactId>
571-
<version>0.8.10</version>
572596
<executions>
573597
<execution>
574598
<id>jacoco-initialize</id>

0 commit comments

Comments
 (0)