Skip to content

Commit daad79d

Browse files
chingor13chingor13
committed
build: fix dependency management
1 parent 7541f60 commit daad79d

File tree

2 files changed

+18
-95
lines changed

2 files changed

+18
-95
lines changed

‎google-cloud-jar-parent/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@
6868
<artifactId>google-api-services-storage</artifactId>
6969
<version>v1-rev20251118-2.0.0</version>
7070
</dependency>
71+
<dependency>
72+
<groupId>io.opentelemetry</groupId>
73+
<artifactId>opentelemetry-bom</artifactId>
74+
<version>1.46.0</version>
75+
<type>pom</type>
76+
<scope>import</scope>
77+
</dependency>
7178

7279
<!-- Test dependencies -->
7380
<dependency>
@@ -126,6 +133,13 @@
126133
<version>3.4</version>
127134
<scope>test</scope>
128135
</dependency>
136+
<!-- for java-logging tests -->
137+
<dependency>
138+
<groupId>io.opentelemetry</groupId>
139+
<artifactId>opentelemetry-semconv</artifactId>
140+
<version>1.1.0-alpha</version>
141+
<scope>test</scope>
142+
</dependency>
129143
</dependencies>
130144
</dependencyManagement>
131145

‎java-logging/pom.xml‎

Lines changed: 4 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,8 @@
5757
<site.installationModule>google-cloud-logging-parent</site.installationModule>
5858
</properties>
5959

60-
<!-- OpenTelemetry -->
6160
<dependencyManagement>
6261
<dependencies>
63-
<dependency>
64-
<groupId>io.opentelemetry</groupId>
65-
<artifactId>opentelemetry-bom</artifactId>
66-
<version>1.46.0</version>
67-
<type>pom</type>
68-
<scope>import</scope>
69-
</dependency>
70-
<!-- <dependency>-->
71-
<!-- <groupId>io.opentelemetry</groupId>-->
72-
<!-- <artifactId>opentelemetry-api</artifactId>-->
73-
<!-- <version>${opentelemetry.version}</version>-->
74-
<!-- </dependency>-->
75-
<!-- <dependency>-->
76-
<!-- <groupId>io.opentelemetry</groupId>-->
77-
<!-- <artifactId>opentelemetry-context</artifactId>-->
78-
<!-- <version>${opentelemetry.version}</version>-->
79-
<!-- </dependency>-->
8062
<dependency>
8163
<groupId>com.google.api.grpc</groupId>
8264
<artifactId>proto-google-cloud-logging-v2</artifactId>
@@ -92,82 +74,6 @@
9274
<artifactId>google-cloud-logging</artifactId>
9375
<version>3.24.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
9476
</dependency>
95-
96-
<dependency>
97-
<groupId>junit</groupId>
98-
<artifactId>junit</artifactId>
99-
<version>4.13.2</version>
100-
<scope>test</scope>
101-
</dependency>
102-
<dependency>
103-
<groupId>org.easymock</groupId>
104-
<artifactId>easymock</artifactId>
105-
<version>5.6.0</version>
106-
<exclusions>
107-
<exclusion>
108-
<groupId>org.objenesis</groupId>
109-
<artifactId>objenesis</artifactId>
110-
</exclusion>
111-
</exclusions>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.objenesis</groupId>
115-
<artifactId>objenesis</artifactId>
116-
<version>3.4</version>
117-
<scope>test</scope>
118-
</dependency>
119-
<dependency>
120-
<groupId>com.google.truth</groupId>
121-
<artifactId>truth</artifactId>
122-
<version>1.4.4</version>
123-
<scope>test</scope>
124-
<exclusions>
125-
<exclusion>
126-
<groupId>org.checkerframework</groupId>
127-
<artifactId>checker-qual</artifactId>
128-
</exclusion>
129-
</exclusions>
130-
</dependency>
131-
<!-- <dependency>-->
132-
<!-- <groupId>io.opentelemetry</groupId>-->
133-
<!-- <artifactId>opentelemetry-api</artifactId>-->
134-
<!--&lt;!&ndash; <version>${opentelemetry.version}</version>&ndash;&gt;-->
135-
<!-- </dependency>-->
136-
<!-- <dependency>-->
137-
<!-- <groupId>io.opentelemetry</groupId>-->
138-
<!-- <artifactId>opentelemetry-context</artifactId>-->
139-
<!--&lt;!&ndash; <version>${opentelemetry.version}</version>&ndash;&gt;-->
140-
<!-- </dependency>-->
141-
<!-- <dependency>-->
142-
<!-- <groupId>io.opentelemetry</groupId>-->
143-
<!-- <artifactId>opentelemetry-sdk</artifactId>-->
144-
<!--&lt;!&ndash; <version>${opentelemetry.version}</version>&ndash;&gt;-->
145-
<!-- <scope>test</scope>-->
146-
<!-- </dependency>-->
147-
<!-- <dependency>-->
148-
<!-- <groupId>io.opentelemetry</groupId>-->
149-
<!-- <artifactId>opentelemetry-sdk-testing</artifactId>-->
150-
<!--&lt;!&ndash; <version>${opentelemetry.version}</version>&ndash;&gt;-->
151-
<!-- <scope>test</scope>-->
152-
<!-- </dependency>-->
153-
<dependency>
154-
<groupId>io.opentelemetry</groupId>
155-
<artifactId>opentelemetry-semconv</artifactId>
156-
<version>1.1.0-alpha</version>
157-
<scope>test</scope>
158-
</dependency>
159-
<!-- <dependency>-->
160-
<!-- <groupId>io.opentelemetry</groupId>-->
161-
<!-- <artifactId>opentelemetry-sdk-trace</artifactId>-->
162-
<!-- <version>${opentelemetry.version}</version>-->
163-
<!-- <scope>test</scope>-->
164-
<!-- </dependency>-->
165-
<!-- <dependency>-->
166-
<!-- <groupId>io.opentelemetry</groupId>-->
167-
<!-- <artifactId>opentelemetry-sdk-common</artifactId>-->
168-
<!-- <version>${opentelemetry.version}</version>-->
169-
<!-- <scope>test</scope>-->
170-
<!-- </dependency>-->
17177
</dependencies>
17278
</dependencyManagement>
17379

@@ -178,7 +84,10 @@
17884
<groupId>org.apache.maven.plugins</groupId>
17985
<artifactId>maven-dependency-plugin</artifactId>
18086
<configuration>
181-
<ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
87+
<ignoredUnusedDeclaredDependencies>
88+
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
89+
<ignoredUnusedDeclaredDependency>org.objenesis:objenesis</ignoredUnusedDeclaredDependency>
90+
</ignoredUnusedDeclaredDependencies>
18291
</configuration>
18392
</plugin>
18493
</plugins>

0 commit comments

Comments
 (0)