Skip to content

Commit 5f443e1

Browse files
hansvahansva
authored
Merge pull request #5106 from hansva/main
cleanup dependencies, #5102
2 parents ac45719 + 5fdc691 commit 5f443e1

File tree

7 files changed

+422
-408
lines changed

7 files changed

+422
-408
lines changed

‎assemblies/static/src/main/resources/LICENSE‎

Lines changed: 345 additions & 360 deletions
Large diffs are not rendered by default.

‎engine/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@
144144
<artifactId>webservices-api</artifactId>
145145
<version>2.3.1</version>
146146
<scope>compile</scope>
147+
<exclusions>
148+
<exclusion>
149+
<groupId>javax.annotation</groupId>
150+
<artifactId>javax.annotation-api</artifactId>
151+
</exclusion>
152+
</exclusions>
147153
</dependency>
148154
<dependency>
149155
<groupId>org.mozilla</groupId>

‎plugins/engines/beam/pom.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@
132132
<groupId>io.opencensus</groupId>
133133
<artifactId>*</artifactId>
134134
</exclusion>
135+
<exclusion>
136+
<groupId>javax.annotation</groupId>
137+
<artifactId>javax.annotation-api</artifactId>
138+
</exclusion>
135139
<exclusion>
136140
<groupId>net.bytebuddy</groupId>
137141
<artifactId>byte-buddy</artifactId>
@@ -202,6 +206,10 @@
202206
<groupId>io.opencensus</groupId>
203207
<artifactId>*</artifactId>
204208
</exclusion>
209+
<exclusion>
210+
<groupId>javax.annotation</groupId>
211+
<artifactId>javax.annotation-api</artifactId>
212+
</exclusion>
205213
<exclusion>
206214
<groupId>org.apache.httpcomponents</groupId>
207215
<artifactId>*</artifactId>
@@ -320,6 +328,10 @@
320328
<groupId>io.opencensus</groupId>
321329
<artifactId>*</artifactId>
322330
</exclusion>
331+
<exclusion>
332+
<groupId>javax.annotation</groupId>
333+
<artifactId>javax.annotation-api</artifactId>
334+
</exclusion>
323335
<exclusion>
324336
<groupId>joda-time</groupId>
325337
<artifactId>joda-time</artifactId>
@@ -426,6 +438,10 @@
426438
<groupId>commons-codec</groupId>
427439
<artifactId>*</artifactId>
428440
</exclusion>
441+
<exclusion>
442+
<groupId>javax.annotation</groupId>
443+
<artifactId>javax.annotation-api</artifactId>
444+
</exclusion>
429445
<exclusion>
430446
<groupId>joda-time</groupId>
431447
<artifactId>joda-time</artifactId>
@@ -838,6 +854,10 @@
838854
<groupId>io.opencensus</groupId>
839855
<artifactId>*</artifactId>
840856
</exclusion>
857+
<exclusion>
858+
<groupId>javax.annotation</groupId>
859+
<artifactId>javax.annotation-api</artifactId>
860+
</exclusion>
841861
<exclusion>
842862
<groupId>joda-time</groupId>
843863
<artifactId>joda-time</artifactId>
@@ -1073,6 +1093,10 @@
10731093
<groupId>jakarta.activation</groupId>
10741094
<artifactId>jakarta.activation-api</artifactId>
10751095
</exclusion>
1096+
<exclusion>
1097+
<groupId>javax.servlet</groupId>
1098+
<artifactId>javax.servlet-api</artifactId>
1099+
</exclusion>
10761100
<exclusion>
10771101
<groupId>log4j</groupId>
10781102
<artifactId>log4j</artifactId>
@@ -1220,6 +1244,14 @@
12201244
<groupId>jakarta.activation</groupId>
12211245
<artifactId>jakarta.activation-api</artifactId>
12221246
</exclusion>
1247+
<exclusion>
1248+
<groupId>javax.inject</groupId>
1249+
<artifactId>javax.inject</artifactId>
1250+
</exclusion>
1251+
<exclusion>
1252+
<groupId>javax.servlet</groupId>
1253+
<artifactId>javax.servlet-api</artifactId>
1254+
</exclusion>
12231255
<exclusion>
12241256
<groupId>log4j</groupId>
12251257
<artifactId>log4j</artifactId>

‎plugins/engines/beam/src/assembly/assembly.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,13 @@
8484
<exclude>io.grpc:grpc-xds:jar</exclude>
8585
<exclude>org.apache.kafka::jar</exclude>
8686
<exclude>org.xerial.snappy:snappy-java:jar</exclude>
87+
<exclude>org.eclipse.jetty::jar</exclude>
88+
<exclude>com.google.cloud:google-cloud-storage:jar</exclude>
89+
<exclude>io.grpc::jar</exclude>
90+
<exclude>com.google.cloud:google-cloud-core-grpc:jar</exclude>
91+
<exclude>com.google.api.grpc:grpc-google-cloud-storage-v2:jar</exclude>
92+
<exclude>com.google.api:gax-grpc:jar</exclude>
93+
<exclude>com.google.api.grpc::jar</exclude>
8794
</excludes>
8895
<outputDirectory>lib/beam</outputDirectory>
8996
</dependencySet>
@@ -114,6 +121,12 @@
114121
<include>io.projectreactor.netty::jar</include>
115122
<include>io.grpc:grpc-netty-shaded:jar</include>
116123
<include>org.apache.kafka::jar</include>
124+
<include>com.google.cloud:google-cloud-storage:jar</include>
125+
<include>io.grpc::jar</include>
126+
<include>com.google.cloud:google-cloud-core-grpc:jar</include>
127+
<include>com.google.api.grpc:grpc-google-cloud-storage-v2:jar</include>
128+
<include>com.google.api:gax-grpc:jar</include>
129+
<include>com.google.api.grpc::jar</include>
117130
</includes>
118131
<outputDirectory>lib/core</outputDirectory>
119132
</dependencySet>

‎plugins/tech/google/pom.xml‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,33 @@
3333
Run 'mvn dependency:tree' in that plugin to verify.
3434
-->
3535
<properties>
36-
<commons-vfs2.version>2.9.0</commons-vfs2.version>
3736
<google-analytics.version>0.65.0</google-analytics.version>
3837
<google-api-drive.version>v3-rev20250216-2.0.0</google-api-drive.version>
3938
<google-api-sheets.version>v4-rev20250211-2.0.0</google-api-sheets.version>
4039
<google-api-sqladmin.version>v1-rev20230721-2.0.0</google-api-sqladmin.version>
41-
<google-cloud-storage.version>2.15.0</google-cloud-storage.version>
42-
<google-http-client.version>1.46.3</google-http-client.version>
43-
<google-oauth-client.version>1.38.0</google-oauth-client.version>
4440
<jetty-client.version>6.1.26</jetty-client.version>
4541
</properties>
4642

4743
<dependencyManagement>
4844
<dependencies>
4945
<dependency>
50-
<groupId>com.google.cloud</groupId>
51-
<artifactId>libraries-bom</artifactId>
52-
<version>26.58.0</version>
46+
<groupId>org.apache.hop</groupId>
47+
<artifactId>hop-libs</artifactId>
48+
<version>${project.version}</version>
5349
<type>pom</type>
5450
<scope>import</scope>
5551
</dependency>
5652
<dependency>
57-
<groupId>org.apache.hop</groupId>
58-
<artifactId>hop-libs</artifactId>
59-
<version>${project.version}</version>
53+
<groupId>org.apache.beam</groupId>
54+
<artifactId>beam-sdks-java-google-cloud-platform-bom</artifactId>
55+
<version>${apache-beam.version}</version>
56+
<type>pom</type>
57+
<scope>import</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.google.cloud</groupId>
61+
<artifactId>libraries-bom</artifactId>
62+
<version>26.58.0</version>
6063
<type>pom</type>
6164
<scope>import</scope>
6265
</dependency>
@@ -117,7 +120,6 @@
117120
<dependency>
118121
<groupId>com.google.cloud</groupId>
119122
<artifactId>google-cloud-storage</artifactId>
120-
<version>${google-cloud-storage.version}</version>
121123
<exclusions>
122124
<exclusion>
123125
<groupId>com.google.protobuf</groupId>
@@ -136,7 +138,6 @@
136138
<dependency>
137139
<groupId>com.google.http-client</groupId>
138140
<artifactId>google-http-client</artifactId>
139-
<version>${google-http-client.version}</version>
140141
<exclusions>
141142
<!-- Vulnerable component - need more recent version [PPP-3571] -->
142143
<exclusion>
@@ -148,25 +149,27 @@
148149
<dependency>
149150
<groupId>com.google.http-client</groupId>
150151
<artifactId>google-http-client-jackson2</artifactId>
151-
<version>${google-http-client.version}</version>
152152
</dependency>
153153
<dependency>
154154
<groupId>com.google.oauth-client</groupId>
155155
<artifactId>google-oauth-client</artifactId>
156-
<version>${google-oauth-client.version}</version>
157156
</dependency>
158157
<!-- Google VFS dependencies -->
159158
<dependency>
160159
<groupId>com.google.oauth-client</groupId>
161160
<artifactId>google-oauth-client-java6</artifactId>
162-
<version>${google-oauth-client.version}</version>
163161
</dependency>
164162

165163
<!-- Google Sheets dependencies -->
166164
<dependency>
167165
<groupId>com.google.oauth-client</groupId>
168166
<artifactId>google-oauth-client-jetty</artifactId>
169-
<version>${google-oauth-client.version}</version>
167+
<exclusions>
168+
<exclusion>
169+
<groupId>org.mortbay.jetty</groupId>
170+
<artifactId>servlet-api</artifactId>
171+
</exclusion>
172+
</exclusions>
170173
</dependency>
171174
<dependency>
172175
<groupId>com.google.protobuf</groupId>
@@ -176,6 +179,12 @@
176179
<groupId>org.mortbay.jetty</groupId>
177180
<artifactId>jetty-client</artifactId>
178181
<version>${jetty-client.version}</version>
182+
<exclusions>
183+
<exclusion>
184+
<groupId>org.mortbay.jetty</groupId>
185+
<artifactId>servlet-api</artifactId>
186+
</exclusion>
187+
</exclusions>
179188
</dependency>
180189
</dependencies>
181190
</project>

‎plugins/tech/google/src/assembly/assembly.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -45,40 +45,8 @@
4545
</includes>
4646
<outputDirectory>plugins/tech/google</outputDirectory>
4747
</dependencySet>
48-
<!-- <dependencySet>-->
49-
<!-- <scope>runtime</scope>-->
50-
<!-- <excludes>-->
51-
<!-- <exclude>com.google.code.gson:gson</exclude>-->
52-
<!-- <exclude>com.google.protobuf:*:jar</exclude>-->
53-
<!-- <exclude>com.google.auth:google-auth-library-oauth2-http:jar</exclude>-->
54-
<!-- <exclude>com.google.oauth-client:google-oauth-client:jar</exclude>-->
55-
<!-- <exclude>com.google.api-client:google-api-client:jar</exclude>-->
56-
<!-- <exclude>com.google.http-client:*:jar</exclude>-->
57-
<!-- <exclude>com.google.android:annotations:jar</exclude>-->
58-
<!-- <exclude>org.codehaus.mojo:animal-sniffer-annotations:jar</exclude>-->
59-
<!-- <exclude>com.google.api:api-common:jar</exclude>-->
60-
<!-- <exclude>com.google.auto.value:auto-value-annotations:jar</exclude>-->
61-
<!-- <exclude>com.google.guava:failureaccess:jar</exclude>-->
62-
<!-- <exclude>io.opencensus:*:jar</exclude>-->
63-
<!-- </excludes>-->
64-
<!-- <outputDirectory>plugins/tech/google/lib</outputDirectory>-->
65-
<!-- </dependencySet>-->
6648
<dependencySet>
6749
<scope>runtime</scope>
68-
<!-- <includes>-->
69-
<!-- <include>com.google.code.gson:gson</include>-->
70-
<!-- <include>com.google.protobuf:*:jar</include>-->
71-
<!-- <include>com.google.auth:google-auth-library-oauth2-http:jar</include>-->
72-
<!-- <include>com.google.oauth-client:google-oauth-client:jar</include>-->
73-
<!-- <include>com.google.api-client:google-api-client:jar</include>-->
74-
<!-- <include>com.google.http-client:*:jar</include>-->
75-
<!-- <include>com.google.android:annotations:jar</include>-->
76-
<!-- <include>org.codehaus.mojo:animal-sniffer-annotations:jar</include>-->
77-
<!-- <include>com.google.api:api-common:jar</include>-->
78-
<!-- <include>com.google.auto.value:auto-value-annotations:jar</include>-->
79-
<!-- <include>com.google.guava:failureaccess:jar</include>-->
80-
<!-- <include>io.opencensus:*:jar</include>-->
81-
<!-- </includes>-->
8250
<excludes>
8351
<exclude>org.apache.hop:hop-tech-google:jar</exclude>
8452
<exclude>io.grpc:grpc-netty-shaded:jar</exclude>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@
427427
<sortExecutions>true</sortExecutions>
428428
<sortDependencies>scope,groupId,artifactId</sortDependencies>
429429
<sortDependencyExclusions>scope,groupId,artifactId</sortDependencyExclusions>
430+
<sortDependencyManagement>false</sortDependencyManagement>
430431
</sortPom>
431432
</pom>
432433
</configuration>

0 commit comments

Comments
 (0)