Skip to content

Commit 3eddc9a

Browse files
zaenkzaenk
authored
[JavaSpring, kotlin-spring] attach sources when maven and interfaceOnly=true is used (#20640)
* [JavaSpring] attach sources when using maven and interfaceOnly=true Closes #15659 * [kotlin-spring] attach sources when using maven and interfaceOnly=true Closes #15659
1 parent 9ed15a1 commit 3eddc9a

File tree

69 files changed

+345
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+345
-8
lines changed

‎modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@
5757

5858
<build>
5959
<sourceDirectory>src/main/java</sourceDirectory>
60-
{{^interfaceOnly}}
6160
<plugins>
62-
<plugin>
61+
{{^interfaceOnly}}<plugin>
6362
<groupId>org.springframework.boot</groupId>
6463
<artifactId>spring-boot-maven-plugin</artifactId>
6564
<configuration>
@@ -75,7 +74,19 @@
7574
</excludes>
7675
{{/lombok}}
7776
</configuration>
78-
</plugin>
77+
</plugin>{{/interfaceOnly}}
78+
{{#interfaceOnly}}<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-source-plugin</artifactId>
81+
<executions>
82+
<execution>
83+
<id>attach-sources</id>
84+
<goals>
85+
<goal>jar</goal>
86+
</goals>
87+
</execution>
88+
</executions>
89+
</plugin>{{/interfaceOnly}}
7990
{{#apiFirst}}
8091
<plugin>
8192
<groupId>org.openapitools</groupId>
@@ -109,7 +120,6 @@
109120
</plugin>
110121
{{/apiFirst}}
111122
</plugins>
112-
{{/interfaceOnly}}
113123
</build>
114124
<dependencies>
115125
<dependency>

‎modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@
5050
{{/parentOverridden}}
5151
<build>
5252
<sourceDirectory>src/main/java</sourceDirectory>
53-
{{^interfaceOnly}}
5453
<plugins>
55-
<plugin>
54+
{{^interfaceOnly}}<plugin>
5655
<groupId>org.springframework.boot</groupId>
5756
<artifactId>spring-boot-maven-plugin</artifactId>
5857
<configuration>
@@ -68,7 +67,19 @@
6867
</excludes>
6968
{{/lombok}}
7069
</configuration>
71-
</plugin>
70+
</plugin>{{/interfaceOnly}}
71+
{{#interfaceOnly}}<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-source-plugin</artifactId>
74+
<executions>
75+
<execution>
76+
<id>attach-sources</id>
77+
<goals>
78+
<goal>jar</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>{{/interfaceOnly}}
7283
{{#apiFirst}}
7384
<plugin>
7485
<groupId>org.openapitools</groupId>
@@ -102,7 +113,6 @@
102113
</plugin>
103114
{{/apiFirst}}
104115
</plugins>
105-
{{/interfaceOnly}}
106116
</build>
107117
<dependencies>
108118
<dependency>

‎modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,20 @@
4545

4646
<build>
4747
<sourceDirectory>src/main/java</sourceDirectory>
48+
{{#interfaceOnly}}<plugins>
49+
<plugin>
50+
<groupId>org.apache.maven.plugins</groupId>
51+
<artifactId>maven-source-plugin</artifactId>
52+
<executions>
53+
<execution>
54+
<id>attach-sources</id>
55+
<goals>
56+
<goal>jar</goal>
57+
</goals>
58+
</execution>
59+
</executions>
60+
</plugin>
61+
</plugins>{{/interfaceOnly}}
4862
</build>
4963

5064
{{^parentOverridden}}

‎modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,20 @@
4444
{{/parentOverridden}}
4545
<build>
4646
<sourceDirectory>src/main/java</sourceDirectory>
47+
{{#interfaceOnly}}<plugins>
48+
<plugin>
49+
<groupId>org.apache.maven.plugins</groupId>
50+
<artifactId>maven-source-plugin</artifactId>
51+
<executions>
52+
<execution>
53+
<id>attach-sources</id>
54+
<goals>
55+
<goal>jar</goal>
56+
</goals>
57+
</execution>
58+
</executions>
59+
</plugin>
60+
</plugins>{{/interfaceOnly}}
4761
</build>
4862

4963
{{^parentOverridden}}

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@
5252
</execution>
5353
</executions>
5454
</plugin>{{/interfaceOnly}}
55+
{{#interfaceOnly}}<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-source-plugin</artifactId>
58+
<executions>
59+
<execution>
60+
<id>attach-sources</id>
61+
<goals>
62+
<goal>jar</goal>
63+
</goals>
64+
</execution>
65+
</executions>
66+
</plugin>{{/interfaceOnly}}
5567
<plugin>
5668
<artifactId>kotlin-maven-plugin</artifactId>
5769
<groupId>org.jetbrains.kotlin</groupId>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@
3939
</execution>
4040
</executions>
4141
</plugin>{{/interfaceOnly}}
42+
{{#interfaceOnly}}<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-source-plugin</artifactId>
45+
<executions>
46+
<execution>
47+
<id>attach-sources</id>
48+
<goals>
49+
<goal>jar</goal>
50+
</goals>
51+
</execution>
52+
</executions>
53+
</plugin>{{/interfaceOnly}}
4254
<plugin>
4355
<artifactId>kotlin-maven-plugin</artifactId>
4456
<groupId>org.jetbrains.kotlin</groupId>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@
6969
</execution>
7070
</executions>
7171
</plugin>{{/interfaceOnly}}
72+
{{#interfaceOnly}}<plugin>
73+
<groupId>org.apache.maven.plugins</groupId>
74+
<artifactId>maven-source-plugin</artifactId>
75+
<executions>
76+
<execution>
77+
<id>attach-sources</id>
78+
<goals>
79+
<goal>jar</goal>
80+
</goals>
81+
</execution>
82+
</executions>
83+
</plugin>{{/interfaceOnly}}
7284
<plugin>
7385
<artifactId>kotlin-maven-plugin</artifactId>
7486
<groupId>org.jetbrains.kotlin</groupId>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@
4949
</execution>
5050
</executions>
5151
</plugin>{{/interfaceOnly}}
52+
{{#interfaceOnly}}<plugin>
53+
<groupId>org.apache.maven.plugins</groupId>
54+
<artifactId>maven-source-plugin</artifactId>
55+
<executions>
56+
<execution>
57+
<id>attach-sources</id>
58+
<goals>
59+
<goal>jar</goal>
60+
</goals>
61+
</execution>
62+
</executions>
63+
</plugin>{{/interfaceOnly}}
5264
<plugin>
5365
<artifactId>kotlin-maven-plugin</artifactId>
5466
<groupId>org.jetbrains.kotlin</groupId>

‎samples/client/petstore/spring-cloud-auth/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
</parent>
2020
<build>
2121
<sourceDirectory>src/main/java</sourceDirectory>
22+
2223
</build>
2324

2425
<dependencyManagement>

‎samples/client/petstore/spring-cloud-date-time/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@
2020
</parent>
2121
<build>
2222
<sourceDirectory>src/main/java</sourceDirectory>
23+
<plugins>
24+
<plugin>
25+
<groupId>org.apache.maven.plugins</groupId>
26+
<artifactId>maven-source-plugin</artifactId>
27+
<executions>
28+
<execution>
29+
<id>attach-sources</id>
30+
<goals>
31+
<goal>jar</goal>
32+
</goals>
33+
</execution>
34+
</executions>
35+
</plugin>
36+
</plugins>
2337
</build>
2438

2539
<dependencyManagement>

0 commit comments

Comments
 (0)