Skip to content

Commit acfe357

Browse files
electrumelectrum
committed
Remove dependency-scope workarounds
1 parent ce751bf commit acfe357

67 files changed

Lines changed: 819 additions & 906 deletions

File tree

Some content is hidden

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

‎client/trino-cli/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,6 @@
111111
<version>${dep.jline.version}</version>
112112
</dependency>
113113

114-
<dependency>
115-
<groupId>com.fasterxml.jackson.core</groupId>
116-
<artifactId>jackson-databind</artifactId>
117-
<scope>runtime</scope>
118-
</dependency>
119-
120-
<dependency>
121-
<groupId>com.fasterxml.jackson.datatype</groupId>
122-
<artifactId>jackson-datatype-jdk8</artifactId>
123-
<scope>runtime</scope>
124-
</dependency>
125-
126114
<dependency>
127115
<groupId>org.jline</groupId>
128116
<artifactId>jline-terminal-ffm</artifactId>
@@ -137,6 +125,18 @@
137125
<scope>runtime</scope>
138126
</dependency>
139127

128+
<dependency>
129+
<groupId>com.fasterxml.jackson.core</groupId>
130+
<artifactId>jackson-databind</artifactId>
131+
<scope>test</scope>
132+
</dependency>
133+
134+
<dependency>
135+
<groupId>com.fasterxml.jackson.datatype</groupId>
136+
<artifactId>jackson-datatype-jdk8</artifactId>
137+
<scope>test</scope>
138+
</dependency>
139+
140140
<dependency>
141141
<groupId>com.squareup.okhttp3</groupId>
142142
<artifactId>mockwebserver3</artifactId>

‎client/trino-client/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@
9494
<optional>true</optional>
9595
</dependency>
9696

97-
<dependency>
98-
<groupId>io.airlift</groupId>
99-
<artifactId>aircompressor-v3</artifactId>
100-
<scope>runtime</scope>
101-
</dependency>
102-
10397
<dependency>
10498
<groupId>com.google.inject</groupId>
10599
<artifactId>guice</artifactId>
@@ -119,6 +113,12 @@
119113
<scope>test</scope>
120114
</dependency>
121115

116+
<dependency>
117+
<groupId>io.airlift</groupId>
118+
<artifactId>aircompressor-v3</artifactId>
119+
<scope>test</scope>
120+
</dependency>
121+
122122
<dependency>
123123
<groupId>io.airlift</groupId>
124124
<artifactId>bootstrap</artifactId>

‎client/trino-jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.fasterxml.jackson.core</groupId>
127127
<artifactId>jackson-databind</artifactId>
128-
<scope>runtime</scope>
128+
<scope>test</scope>
129129
</dependency>
130130

131131
<dependency>

‎core/trino-main/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
</properties>
2020

2121
<dependencies>
22-
2322
<dependency>
2423
<groupId>com.clearspring.analytics</groupId>
2524
<artifactId>stream</artifactId>
@@ -403,14 +402,14 @@
403402
</dependency>
404403

405404
<dependency>
406-
<groupId>com.squareup.okhttp3</groupId>
407-
<artifactId>okhttp-jvm</artifactId>
408-
<scope>runtime</scope>
405+
<groupId>com.h2database</groupId>
406+
<artifactId>h2</artifactId>
407+
<scope>test</scope>
409408
</dependency>
410409

411410
<dependency>
412-
<groupId>com.h2database</groupId>
413-
<artifactId>h2</artifactId>
411+
<groupId>com.squareup.okhttp3</groupId>
412+
<artifactId>okhttp-jvm</artifactId>
414413
<scope>test</scope>
415414
</dependency>
416415

‎lib/trino-filesystem-azure/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,24 +138,24 @@
138138
<dependency>
139139
<groupId>com.fasterxml.jackson.dataformat</groupId>
140140
<artifactId>jackson-dataformat-xml</artifactId>
141-
<scope>runtime</scope>
141+
<scope>test</scope>
142142
</dependency>
143143

144144
<dependency>
145145
<groupId>io.airlift</groupId>
146-
<artifactId>slice</artifactId>
147-
<scope>runtime</scope>
146+
<artifactId>configuration-testing</artifactId>
147+
<scope>test</scope>
148148
</dependency>
149149

150150
<dependency>
151151
<groupId>io.airlift</groupId>
152-
<artifactId>configuration-testing</artifactId>
152+
<artifactId>junit-extensions</artifactId>
153153
<scope>test</scope>
154154
</dependency>
155155

156156
<dependency>
157157
<groupId>io.airlift</groupId>
158-
<artifactId>junit-extensions</artifactId>
158+
<artifactId>slice</artifactId>
159159
<scope>test</scope>
160160
</dependency>
161161

‎lib/trino-filesystem-cache-alluxio/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,31 +108,31 @@
108108

109109
<dependency>
110110
<groupId>io.airlift</groupId>
111-
<artifactId>slice</artifactId>
112-
<scope>runtime</scope>
111+
<artifactId>configuration-testing</artifactId>
112+
<scope>test</scope>
113113
</dependency>
114114

115115
<dependency>
116116
<groupId>io.airlift</groupId>
117-
<artifactId>tracing</artifactId>
118-
<scope>runtime</scope>
117+
<artifactId>junit-extensions</artifactId>
118+
<scope>test</scope>
119119
</dependency>
120120

121121
<dependency>
122-
<groupId>io.opentelemetry</groupId>
123-
<artifactId>opentelemetry-sdk-trace</artifactId>
124-
<scope>runtime</scope>
122+
<groupId>io.airlift</groupId>
123+
<artifactId>slice</artifactId>
124+
<scope>test</scope>
125125
</dependency>
126126

127127
<dependency>
128128
<groupId>io.airlift</groupId>
129-
<artifactId>configuration-testing</artifactId>
129+
<artifactId>tracing</artifactId>
130130
<scope>test</scope>
131131
</dependency>
132132

133133
<dependency>
134-
<groupId>io.airlift</groupId>
135-
<artifactId>junit-extensions</artifactId>
134+
<groupId>io.opentelemetry</groupId>
135+
<artifactId>opentelemetry-sdk-trace</artifactId>
136136
<scope>test</scope>
137137
</dependency>
138138

‎lib/trino-filesystem/pom.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -102,37 +102,31 @@
102102

103103
<dependency>
104104
<groupId>io.airlift</groupId>
105-
<artifactId>tracing</artifactId>
106-
<scope>runtime</scope>
107-
</dependency>
108-
109-
<dependency>
110-
<groupId>io.opentelemetry</groupId>
111-
<artifactId>opentelemetry-sdk-trace</artifactId>
112-
<scope>runtime</scope>
105+
<artifactId>configuration-testing</artifactId>
106+
<scope>test</scope>
113107
</dependency>
114108

115109
<dependency>
116-
<groupId>org.checkerframework</groupId>
117-
<artifactId>checker-qual</artifactId>
118-
<scope>runtime</scope>
110+
<groupId>io.airlift</groupId>
111+
<artifactId>junit-extensions</artifactId>
112+
<scope>test</scope>
119113
</dependency>
120114

121115
<dependency>
122116
<groupId>io.airlift</groupId>
123-
<artifactId>configuration-testing</artifactId>
117+
<artifactId>testing</artifactId>
124118
<scope>test</scope>
125119
</dependency>
126120

127121
<dependency>
128122
<groupId>io.airlift</groupId>
129-
<artifactId>junit-extensions</artifactId>
123+
<artifactId>tracing</artifactId>
130124
<scope>test</scope>
131125
</dependency>
132126

133127
<dependency>
134-
<groupId>io.airlift</groupId>
135-
<artifactId>testing</artifactId>
128+
<groupId>io.opentelemetry</groupId>
129+
<artifactId>opentelemetry-sdk-trace</artifactId>
136130
<scope>test</scope>
137131
</dependency>
138132

@@ -166,6 +160,12 @@
166160
<scope>test</scope>
167161
</dependency>
168162

163+
<dependency>
164+
<groupId>org.checkerframework</groupId>
165+
<artifactId>checker-qual</artifactId>
166+
<scope>test</scope>
167+
</dependency>
168+
169169
<dependency>
170170
<groupId>org.junit.jupiter</groupId>
171171
<artifactId>junit-jupiter-api</artifactId>

‎lib/trino-hdfs/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
<name>${project.artifactId}</name>
1414
<description>Trino - Legacy HDFS file system support</description>
1515

16-
<properties>
17-
<!-- TODO: remove when dependency-scope is removed from airbase -->
18-
<air.check.skip-dependency-scope>true</air.check.skip-dependency-scope>
19-
</properties>
20-
2116
<dependencies>
2217
<dependency>
2318
<groupId>com.google.errorprone</groupId>

‎lib/trino-hive-formats/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,6 @@
152152
<scope>runtime</scope>
153153
</dependency>
154154

155-
<dependency>
156-
<groupId>io.airlift</groupId>
157-
<artifactId>log-manager</artifactId>
158-
<scope>runtime</scope>
159-
</dependency>
160-
161155
<!-- TODO: remove after making Avro use Aircompressor -->
162156
<dependency>
163157
<groupId>org.xerial.snappy</groupId>
@@ -171,6 +165,12 @@
171165
<scope>test</scope>
172166
</dependency>
173167

168+
<dependency>
169+
<groupId>io.airlift</groupId>
170+
<artifactId>log-manager</artifactId>
171+
<scope>test</scope>
172+
</dependency>
173+
174174
<dependency>
175175
<groupId>io.airlift</groupId>
176176
<artifactId>testing</artifactId>

‎lib/trino-orc/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@
113113

114114
<dependency>
115115
<groupId>io.airlift</groupId>
116-
<artifactId>json</artifactId>
117-
<scope>runtime</scope>
116+
<artifactId>aircompressor</artifactId>
117+
<scope>test</scope>
118118
</dependency>
119119

120120
<dependency>
121121
<groupId>io.airlift</groupId>
122-
<artifactId>aircompressor</artifactId>
122+
<artifactId>json</artifactId>
123123
<scope>test</scope>
124124
</dependency>
125125

0 commit comments

Comments
 (0)