Skip to content

Commit 2585a9e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1769 from yue9944882/chore/trim-fluent-pom
Chore: Trimming pom files for fluent modules
2 parents b9f1aeb + 2625e6f commit 2585a9e

File tree

3 files changed

+14
-206
lines changed

3 files changed

+14
-206
lines changed

‎fluent-gen/pom.xml‎

Lines changed: 3 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<groupId>io.kubernetes</groupId>
44
<artifactId>client-java-api-fluent-gen</artifactId>
55
<packaging>bundle</packaging>
6-
<name>client-java-api</name>
6+
<name>client-java-fluent-gen</name>
77
<url>https://github.com/kubernetes-client/java</url>
8-
<description>Swagger Java</description>
8+
<description>Client Java Fluent Generator</description>
99
<prerequisites>
1010
<maven>2.2.0</maven>
1111
</prerequisites>
@@ -22,117 +22,7 @@
2222
<plugin>
2323
<groupId>org.apache.felix</groupId>
2424
<artifactId>maven-bundle-plugin</artifactId>
25-
<extensions>true</extensions>
26-
</plugin>
27-
<plugin>
28-
<groupId>org.apache.maven.plugins</groupId>
29-
<artifactId>maven-surefire-plugin</artifactId>
30-
<configuration>
31-
<systemProperties>
32-
<property>
33-
<name>loggerPath</name>
34-
<value>conf/log4j.properties</value>
35-
</property>
36-
</systemProperties>
37-
<argLine>-Xms512m -Xmx1500m</argLine>
38-
<parallel>methods</parallel>
39-
<useUnlimitedThreads>true</useUnlimitedThreads>
40-
<forkCount>1</forkCount>
41-
<reuseForks>false</reuseForks>
42-
</configuration>
43-
</plugin>
44-
<plugin>
45-
<artifactId>maven-dependency-plugin</artifactId>
46-
<executions>
47-
<execution>
48-
<phase>package</phase>
49-
<goals>
50-
<goal>copy-dependencies</goal>
51-
</goals>
52-
<configuration>
53-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
54-
</configuration>
55-
</execution>
56-
</executions>
57-
</plugin>
58-
59-
<!-- attach test jar -->
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-jar-plugin</artifactId>
63-
<executions>
64-
<execution>
65-
<goals>
66-
<goal>test-jar</goal>
67-
</goals>
68-
</execution>
69-
</executions>
70-
<configuration>
71-
</configuration>
72-
</plugin>
73-
74-
<plugin>
75-
<groupId>org.codehaus.mojo</groupId>
76-
<artifactId>build-helper-maven-plugin</artifactId>
77-
<executions>
78-
<execution>
79-
<id>add_sources</id>
80-
<phase>generate-sources</phase>
81-
<goals>
82-
<goal>add-source</goal>
83-
</goals>
84-
<configuration>
85-
<sources>
86-
<source>src/main/java</source>
87-
</sources>
88-
</configuration>
89-
</execution>
90-
<execution>
91-
<id>add_test_sources</id>
92-
<phase>generate-test-sources</phase>
93-
<goals>
94-
<goal>add-test-source</goal>
95-
</goals>
96-
<configuration>
97-
<sources>
98-
<source>src/test/java</source>
99-
</sources>
100-
</configuration>
101-
</execution>
102-
</executions>
103-
</plugin>
104-
<plugin>
105-
<groupId>org.apache.maven.plugins</groupId>
106-
<artifactId>maven-javadoc-plugin</artifactId>
107-
<executions>
108-
<execution>
109-
<id>attach-javadocs</id>
110-
<goals>
111-
<goal>jar</goal>
112-
</goals>
113-
</execution>
114-
</executions>
115-
<configuration>
116-
<tags>
117-
<tag>
118-
<name>http.response.details</name>
119-
<placement>a</placement>
120-
<head>Http Response Details:</head>
121-
</tag>
122-
</tags>
123-
</configuration>
124-
</plugin>
125-
<plugin>
126-
<groupId>org.apache.maven.plugins</groupId>
127-
<artifactId>maven-source-plugin</artifactId>
128-
<executions>
129-
<execution>
130-
<id>attach-sources</id>
131-
<goals>
132-
<goal>jar-no-fork</goal>
133-
</goals>
134-
</execution>
135-
</executions>
25+
<version>5.1.2</version>
13626
</plugin>
13727
</plugins>
13828
</build>
@@ -187,22 +77,5 @@
18777
<artifactId>client-java-api</artifactId>
18878
<version>${project.version}</version>
18979
</dependency>
190-
191-
<!-- test dependencies -->
192-
<dependency>
193-
<groupId>org.hamcrest</groupId>
194-
<artifactId>hamcrest-junit</artifactId>
195-
<scope>test</scope>
196-
</dependency>
197-
<dependency>
198-
<groupId>ch.qos.logback</groupId>
199-
<artifactId>logback-classic</artifactId>
200-
<scope>test</scope>
201-
</dependency>
202-
<dependency>
203-
<groupId>junit</groupId>
204-
<artifactId>junit</artifactId>
205-
<scope>test</scope>
206-
</dependency>
20780
</dependencies>
20881
</project>

‎fluent/pom.xml‎

Lines changed: 4 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
<groupId>io.kubernetes</groupId>
44
<artifactId>client-java-api-fluent</artifactId>
55
<packaging>bundle</packaging>
6-
<name>client-java</name>
6+
<name>client-java-fluent</name>
77
<url>https://github.com/kubernetes-client/java</url>
88
<parent>
99
<groupId>io.kubernetes</groupId>
1010
<artifactId>client-java-parent</artifactId>
1111
<version>12.0.1-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
14+
1415
<dependencies>
1516
<dependency>
1617
<groupId>io.kubernetes</groupId>
@@ -31,92 +32,19 @@
3132
</dependencies>
3233
<build>
3334
<plugins>
34-
<plugin>
35-
<groupId>org.jacoco</groupId>
36-
<artifactId>jacoco-maven-plugin</artifactId>
37-
<version>0.8.7</version>
38-
<executions>
39-
<execution>
40-
<id>jacoco-initialize</id>
41-
<goals>
42-
<goal>prepare-agent</goal>
43-
</goals>
44-
</execution>
45-
<execution>
46-
<id>jacoco-report</id>
47-
<phase>test</phase>
48-
<goals>
49-
<goal>report</goal>
50-
</goals>
51-
</execution>
52-
</executions>
53-
</plugin>
5435
<plugin>
5536
<groupId>org.apache.felix</groupId>
5637
<artifactId>maven-bundle-plugin</artifactId>
57-
<extensions>true</extensions>
58-
</plugin>
59-
<plugin>
60-
<groupId>org.apache.maven.plugins</groupId>
61-
<artifactId>maven-compiler-plugin</artifactId>
62-
<configuration>
63-
<source>8</source>
64-
<target>8</target>
65-
</configuration>
38+
<version>5.1.2</version>
6639
</plugin>
6740
<plugin>
6841
<groupId>com.diffplug.spotless</groupId>
6942
<artifactId>spotless-maven-plugin</artifactId>
43+
<version>2.12.1</version>
7044
<configuration>
7145
<skip>true</skip>
7246
</configuration>
7347
</plugin>
7448
</plugins>
7549
</build>
76-
<profiles>
77-
<profile>
78-
<id>surefire-newerJava</id>
79-
<activation>
80-
<jdk>(1.8,)</jdk>
81-
</activation>
82-
<build>
83-
<plugins>
84-
<plugin>
85-
<groupId>org.apache.maven.plugins</groupId>
86-
<artifactId>maven-surefire-plugin</artifactId>
87-
<configuration>
88-
<argLine>@{argLine} -Xms512m -Xmx1500m --illegal-access=warn</argLine>
89-
<parallel>methods</parallel>
90-
<perCoreThreadCount>false</perCoreThreadCount>
91-
<threadCount>1</threadCount>
92-
<forkCount>1</forkCount>
93-
<reuseForks>false</reuseForks>
94-
</configuration>
95-
</plugin>
96-
</plugins>
97-
</build>
98-
</profile>
99-
<profile>
100-
<id>surefire-java8</id>
101-
<activation>
102-
<jdk>1.8</jdk>
103-
</activation>
104-
<build>
105-
<plugins>
106-
<plugin>
107-
<groupId>org.apache.maven.plugins</groupId>
108-
<artifactId>maven-surefire-plugin</artifactId>
109-
<configuration>
110-
<argLine>@{argLine} -Xms512m -Xmx1500m</argLine>
111-
<parallel>methods</parallel>
112-
<perCoreThreadCount>false</perCoreThreadCount>
113-
<threadCount>1</threadCount>
114-
<forkCount>1</forkCount>
115-
<reuseForks>false</reuseForks>
116-
</configuration>
117-
</plugin>
118-
</plugins>
119-
</build>
120-
</profile>
121-
</profiles>
12250
</project>

‎pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ limitations under the License.
512512
</plugin>
513513
</plugins>
514514
</build>
515+
515516
<profiles>
516517
<profile>
517518
<id>release-sign-artifacts</id>
@@ -541,5 +542,11 @@ limitations under the License.
541542
</plugins>
542543
</build>
543544
</profile>
545+
<profile>
546+
<id>fluent-gen</id>
547+
<modules>
548+
<module>fluent-gen</module>
549+
</modules>
550+
</profile>
544551
</profiles>
545552
</project>

0 commit comments

Comments
 (0)