Skip to content

Commit 6273aa7

Browse files
fabiobrzfabiobrz
committed
[java-generator] Gradle plugin review - Fix gradle dependencies
1 parent 193c11b commit 6273aa7

File tree

3 files changed

+43
-99
lines changed

3 files changed

+43
-99
lines changed

‎java-generator/gradle-plugin/pom.xml‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -73,50 +73,6 @@
7373
<groupId>org.gradle</groupId>
7474
<artifactId>gradle-model-core</artifactId>
7575
</dependency>
76-
<dependency>
77-
<groupId>org.slf4j</groupId>
78-
<artifactId>slf4j-api</artifactId>
79-
</dependency>
80-
<!-- test -->
81-
<dependency>
82-
<groupId>org.junit.jupiter</groupId>
83-
<artifactId>junit-jupiter-engine</artifactId>
84-
<scope>test</scope>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.junit.jupiter</groupId>
88-
<artifactId>junit-jupiter-params</artifactId>
89-
<scope>test</scope>
90-
</dependency>
91-
<dependency>
92-
<groupId>org.mockito</groupId>
93-
<artifactId>mockito-core</artifactId>
94-
</dependency>
95-
<dependency>
96-
<groupId>org.assertj</groupId>
97-
<artifactId>assertj-core</artifactId>
98-
</dependency>
99-
<!-- More Gradle -->
100-
<dependency>
101-
<groupId>org.gradle</groupId>
102-
<artifactId>gradle-base-services-groovy</artifactId>
103-
</dependency>
104-
<dependency>
105-
<groupId>org.gradle</groupId>
106-
<artifactId>gradle-messaging</artifactId>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.gradle</groupId>
110-
<artifactId>gradle-native</artifactId>
111-
</dependency>
112-
<dependency>
113-
<groupId>org.gradle</groupId>
114-
<artifactId>gradle-platform-jvm</artifactId>
115-
</dependency>
116-
<dependency>
117-
<groupId>org.gradle</groupId>
118-
<artifactId>gradle-process-services</artifactId>
119-
</dependency>
12076
</dependencies>
12177

12278
</project>

‎java-generator/it/pom.xml‎

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -57,59 +57,20 @@
5757
<groupId>io.fabric8</groupId>
5858
<artifactId>camel-k-client</artifactId>
5959
</dependency>
60-
61-
<dependency>
62-
<groupId>org.codehaus.groovy</groupId>
63-
<artifactId>groovy-all</artifactId>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.gradle</groupId>
67-
<artifactId>gradle-base-services</artifactId>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.gradle</groupId>
71-
<artifactId>gradle-core</artifactId>
72-
</dependency>
73-
<dependency>
74-
<groupId>org.gradle</groupId>
75-
<artifactId>gradle-core-api</artifactId>
76-
</dependency>
77-
<dependency>
78-
<groupId>org.gradle</groupId>
79-
<artifactId>gradle-logging</artifactId>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.gradle</groupId>
83-
<artifactId>gradle-plugins</artifactId>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.gradle</groupId>
87-
<artifactId>gradle-model-core</artifactId>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.slf4j</groupId>
91-
<artifactId>slf4j-api</artifactId>
92-
</dependency>
9360
<!-- test -->
9461
<dependency>
9562
<groupId>org.junit.jupiter</groupId>
9663
<artifactId>junit-jupiter-engine</artifactId>
97-
<scope>test</scope>
9864
</dependency>
9965
<dependency>
10066
<groupId>org.junit.jupiter</groupId>
10167
<artifactId>junit-jupiter-params</artifactId>
102-
<scope>test</scope>
103-
</dependency>
104-
<dependency>
105-
<groupId>org.mockito</groupId>
106-
<artifactId>mockito-core</artifactId>
10768
</dependency>
10869
<dependency>
10970
<groupId>org.assertj</groupId>
11071
<artifactId>assertj-core</artifactId>
11172
</dependency>
112-
<!-- More Gradle -->
73+
<!-- Gradle plugin test -->
11374
<dependency>
11475
<groupId>org.gradle</groupId>
11576
<artifactId>gradle-base-services-groovy</artifactId>
@@ -133,25 +94,23 @@
13394
<dependency>
13495
<groupId>org.gradle</groupId>
13596
<artifactId>gradle-test-kit</artifactId>
136-
<scope>test</scope>
13797
</dependency>
13898
<dependency>
13999
<groupId>org.gradle</groupId>
140100
<artifactId>gradle-tooling-api</artifactId>
141101
</dependency>
142102
<dependency>
143-
<groupId>javax.inject</groupId>
144-
<artifactId>javax.inject</artifactId>
103+
<groupId>org.gradle</groupId>
104+
<artifactId>gradle-test-kit</artifactId>
145105
</dependency>
106+
<!-- Gradle execution will need these on the classpath -->
146107
<dependency>
147108
<groupId>commons-io</groupId>
148109
<artifactId>commons-io</artifactId>
149-
<version>2.11.0</version>
150110
</dependency>
151111
<dependency>
152112
<groupId>com.google.guava</groupId>
153113
<artifactId>guava</artifactId>
154-
<version>31.1-jre</version>
155114
</dependency>
156115
</dependencies>
157116

‎java-generator/pom.xml‎

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
<version.gradle>6.1.1</version.gradle>
4444
<version.groovy>2.4.21</version.groovy>
4545
<version.javax.inject>1</version.javax.inject>
46+
<commons-io.version>2.11.0</commons-io.version>
47+
<guava.version>31.1-jre</guava.version>
4648
</properties>
4749

4850
<repositories>
@@ -68,87 +70,114 @@
6870

6971
<dependencyManagement>
7072
<dependencies>
73+
<!-- Gradle plugin implementation -->
74+
<dependency>
75+
<groupId>javax.inject</groupId>
76+
<artifactId>javax.inject</artifactId>
77+
<version>${version.javax.inject}</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>io.fabric8</groupId>
81+
<artifactId>java-generator-core</artifactId>
82+
<version>${project.version}</version>
83+
</dependency>
7184
<dependency>
7285
<groupId>org.codehaus.groovy</groupId>
7386
<artifactId>groovy-all</artifactId>
7487
<version>${version.groovy}</version>
88+
<scope>provided</scope>
7589
</dependency>
7690
<dependency>
7791
<groupId>org.gradle</groupId>
7892
<artifactId>gradle-base-services</artifactId>
7993
<version>${version.gradle}</version>
94+
<scope>provided</scope>
8095
</dependency>
8196
<dependency>
8297
<groupId>org.gradle</groupId>
8398
<artifactId>gradle-core</artifactId>
8499
<version>${version.gradle}</version>
100+
<scope>provided</scope>
85101
</dependency>
86102
<dependency>
87103
<groupId>org.gradle</groupId>
88104
<artifactId>gradle-core-api</artifactId>
89105
<version>${version.gradle}</version>
106+
<scope>provided</scope>
90107
</dependency>
91108
<dependency>
92109
<groupId>org.gradle</groupId>
93110
<artifactId>gradle-logging</artifactId>
94111
<version>${version.gradle}</version>
112+
<scope>provided</scope>
95113
</dependency>
96114
<dependency>
97115
<groupId>org.gradle</groupId>
98116
<artifactId>gradle-plugins</artifactId>
99117
<version>${version.gradle}</version>
118+
<scope>provided</scope>
100119
</dependency>
101120
<dependency>
102121
<groupId>org.gradle</groupId>
103122
<artifactId>gradle-model-core</artifactId>
104123
<version>${version.gradle}</version>
124+
<scope>provided</scope>
105125
</dependency>
106-
<dependency>
107-
<groupId>io.fabric8</groupId>
108-
<artifactId>java-generator-core</artifactId>
109-
<version>${project.version}</version>
110-
</dependency>
126+
<!-- Gradle plugin test-->
111127
<dependency>
112128
<groupId>org.gradle</groupId>
113129
<artifactId>gradle-base-services-groovy</artifactId>
114130
<version>${version.gradle}</version>
131+
<scope>test</scope>
115132
</dependency>
116133
<dependency>
117134
<groupId>org.gradle</groupId>
118135
<artifactId>gradle-messaging</artifactId>
119136
<version>${version.gradle}</version>
137+
<scope>test</scope>
120138
</dependency>
121139
<dependency>
122140
<groupId>org.gradle</groupId>
123141
<artifactId>gradle-native</artifactId>
124142
<version>${version.gradle}</version>
143+
<scope>test</scope>
125144
</dependency>
126145
<dependency>
127146
<groupId>org.gradle</groupId>
128147
<artifactId>gradle-platform-jvm</artifactId>
129148
<version>${version.gradle}</version>
149+
<scope>test</scope>
130150
</dependency>
131151
<dependency>
132152
<groupId>org.gradle</groupId>
133153
<artifactId>gradle-process-services</artifactId>
134154
<version>${version.gradle}</version>
155+
<scope>test</scope>
135156
</dependency>
136-
137157
<dependency>
138158
<groupId>org.gradle</groupId>
139159
<artifactId>gradle-test-kit</artifactId>
140160
<version>${version.gradle}</version>
161+
<scope>test</scope>
141162
</dependency>
142163
<dependency>
143164
<groupId>org.gradle</groupId>
144165
<artifactId>gradle-tooling-api</artifactId>
145166
<version>${version.gradle}</version>
167+
<scope>test</scope>
146168
</dependency>
147-
<!-- Gradle plugin implementation -->
169+
<!-- Gradle test execution will need these on the classpath -->
148170
<dependency>
149-
<groupId>javax.inject</groupId>
150-
<artifactId>javax.inject</artifactId>
151-
<version>${version.javax.inject}</version>
171+
<groupId>commons-io</groupId>
172+
<artifactId>commons-io</artifactId>
173+
<version>${commons-io.version}</version>
174+
<scope>test</scope>
175+
</dependency>
176+
<dependency>
177+
<groupId>com.google.guava</groupId>
178+
<artifactId>guava</artifactId>
179+
<version>${guava.version}</version>
180+
<scope>test</scope>
152181
</dependency>
153182
</dependencies>
154183
</dependencyManagement>

0 commit comments

Comments
 (0)