Skip to content

Commit 3f0e0ca

Browse files
dhoarddhoard
committed
Cleaned up Maven configuration
Signed-off-by: dhoard <doug.hoard@gmail.com>
1 parent 1a93f59 commit 3f0e0ca

File tree

9 files changed

+160
-750
lines changed

9 files changed

+160
-750
lines changed

‎collector/pom.xml‎

Lines changed: 6 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,17 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33

44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>io.prometheus.jmx</groupId>
5+
<parent>
6+
<groupId>io.prometheus.jmx</groupId>
7+
<artifactId>jmx_exporter</artifactId>
8+
<version>1.5.0-post</version>
9+
</parent>
610
<artifactId>collector</artifactId>
7-
<version>1.5.0-post</version>
811
<packaging>jar</packaging>
912
<name>Prometheus JMX Exporter - Collector</name>
1013
<description>See https://github.com/prometheus/jmx_exporter/blob/main/README.md</description>
1114
<url>https://github.com/prometheus/jmx_exporter</url>
1215

13-
<licenses>
14-
<license>
15-
<name>The Apache Software License, Version 2.0</name>
16-
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
17-
<distribution>repo</distribution>
18-
</license>
19-
</licenses>
20-
2116
<developers>
2217
<developer>
2318
<name>Doug Hoard</name>
@@ -36,127 +31,50 @@
3631
<tag>HEAD</tag>
3732
</scm>
3833

39-
<properties>
40-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
42-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
43-
<prometheus.metrics.version>1.5.1</prometheus.metrics.version>
44-
</properties>
45-
4634
<dependencies>
4735
<dependency>
4836
<groupId>io.prometheus</groupId>
4937
<artifactId>prometheus-metrics-core</artifactId>
50-
<version>${prometheus.metrics.version}</version>
5138
</dependency>
5239
<dependency>
5340
<groupId>io.prometheus</groupId>
5441
<artifactId>prometheus-metrics-model</artifactId>
55-
<version>${prometheus.metrics.version}</version>
5642
</dependency>
5743
<dependency>
5844
<groupId>org.yaml</groupId>
5945
<artifactId>snakeyaml</artifactId>
60-
<version>2.6</version>
6146
</dependency>
6247
<dependency>
6348
<groupId>io.github.hakky54</groupId>
6449
<artifactId>ayza</artifactId>
65-
<version>10.0.4</version>
6650
</dependency>
6751
<dependency>
6852
<groupId>org.junit.jupiter</groupId>
6953
<artifactId>junit-jupiter</artifactId>
70-
<version>6.0.3</version>
7154
<scope>test</scope>
7255
</dependency>
7356
<dependency>
7457
<groupId>org.junit.jupiter</groupId>
7558
<artifactId>junit-jupiter-params</artifactId>
76-
<version>6.0.3</version>
7759
<scope>test</scope>
7860
</dependency>
7961
<dependency>
8062
<groupId>org.assertj</groupId>
8163
<artifactId>assertj-core</artifactId>
82-
<version>3.27.7</version>
8364
<scope>test</scope>
8465
</dependency>
8566
</dependencies>
8667

8768
<build>
8869
<plugins>
89-
<plugin>
90-
<groupId>org.apache.maven.plugins</groupId>
91-
<artifactId>maven-compiler-plugin</artifactId>
92-
<version>3.15.0</version>
93-
<configuration>
94-
<compilerArgument>-Xbootclasspath/a:${env.JAVA_HOME}/lib/</compilerArgument>
95-
<source>8</source>
96-
<target>8</target>
97-
</configuration>
98-
</plugin>
9970
<plugin>
10071
<artifactId>maven-surefire-plugin</artifactId>
101-
<version>3.5.5</version>
10272
<configuration>
10373
<systemPropertyVariables>
10474
<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
10575
</systemPropertyVariables>
10676
</configuration>
10777
</plugin>
108-
<plugin>
109-
<groupId>org.apache.maven.plugins</groupId>
110-
<artifactId>maven-enforcer-plugin</artifactId>
111-
<version>3.6.2</version>
112-
<executions>
113-
<execution>
114-
<id>enforce-maven</id>
115-
<goals>
116-
<goal>enforce</goal>
117-
</goals>
118-
<configuration>
119-
<rules>
120-
<requireMavenVersion>
121-
<version>3.9.6</version>
122-
</requireMavenVersion>
123-
</rules>
124-
</configuration>
125-
</execution>
126-
</executions>
127-
</plugin>
128-
<plugin>
129-
<groupId>org.codehaus.mojo</groupId>
130-
<artifactId>versions-maven-plugin</artifactId>
131-
<version>2.21.0</version>
132-
<configuration>
133-
<rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
134-
</configuration>
135-
</plugin>
136-
<plugin>
137-
<groupId>com.diffplug.spotless</groupId>
138-
<artifactId>spotless-maven-plugin</artifactId>
139-
<version>3.4.0</version>
140-
<configuration>
141-
<licenseHeader>
142-
<file>${maven.multiModuleProjectDirectory}/license-header.txt</file>
143-
</licenseHeader>
144-
<java>
145-
<palantirJavaFormat>
146-
<version>2.89.0</version>
147-
<style>PALANTIR</style>
148-
</palantirJavaFormat>
149-
</java>
150-
</configuration>
151-
<executions>
152-
<execution>
153-
<phase>compile</phase>
154-
<goals>
155-
<goal>apply</goal>
156-
</goals>
157-
</execution>
158-
</executions>
159-
</plugin>
16078
</plugins>
16179
</build>
16280

@@ -168,7 +86,6 @@
16886
<plugin>
16987
<groupId>org.apache.maven.plugins</groupId>
17088
<artifactId>maven-javadoc-plugin</artifactId>
171-
<version>3.12.0</version>
17289
<executions>
17390
<execution>
17491
<id>attach-javadocs</id>
@@ -181,7 +98,6 @@
18198
<plugin>
18299
<groupId>org.apache.maven.plugins</groupId>
183100
<artifactId>maven-gpg-plugin</artifactId>
184-
<version>3.2.8</version>
185101
<executions>
186102
<execution>
187103
<id>sign-artifacts</id>
@@ -201,7 +117,6 @@
201117
<plugin>
202118
<groupId>org.apache.maven.plugins</groupId>
203119
<artifactId>maven-source-plugin</artifactId>
204-
<version>3.4.0</version>
205120
<executions>
206121
<execution>
207122
<id>attach-sources</id>
@@ -227,4 +142,4 @@
227142
</profile>
228143
</profiles>
229144

230-
</project>
145+
</project>

‎integration_test_suite/integration_tests/pom.xml‎

Lines changed: 4 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -14,65 +14,45 @@
1414
<description>See https://github.com/prometheus/jmx_exporter/blob/main/README.md</description>
1515
<url>https://github.com/prometheus/jmx_exporter</url>
1616

17-
<licenses>
18-
<license>
19-
<name>The Apache Software License, Version 2.0</name>
20-
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
21-
<distribution>repo</distribution>
22-
</license>
23-
</licenses>
24-
2517
<properties>
26-
<maven.compiler.source>11</maven.compiler.source>
27-
<maven.compiler.target>11</maven.compiler.target>
28-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
30-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
31-
<prometheus.metrics.version>1.5.1</prometheus.metrics.version>
32-
<verifyica.version>1.0.6</verifyica.version>
18+
<maven.compiler.source>17</maven.compiler.source>
19+
<maven.compiler.target>17</maven.compiler.target>
20+
<maven.compiler.release>17</maven.compiler.release>
3321
<automatic.module.name>io.prometheus.jmx.test</automatic.module.name>
3422
</properties>
3523

3624
<dependencies>
3725
<dependency>
3826
<groupId>org.verifyica</groupId>
3927
<artifactId>verifyica-api</artifactId>
40-
<version>${verifyica.version}</version>
4128
</dependency>
4229
<dependency>
4330
<groupId>org.verifyica</groupId>
4431
<artifactId>verifyica-engine</artifactId>
45-
<version>${verifyica.version}</version>
4632
</dependency>
4733
<dependency>
4834
<groupId>io.prometheus.jmx</groupId>
4935
<artifactId>jmx_prometheus_common</artifactId>
50-
<version>${project.version}</version>
5136
</dependency>
5237
<dependency>
5338
<groupId>io.prometheus</groupId>
5439
<artifactId>prometheus-metrics-model</artifactId>
55-
<version>${prometheus.metrics.version}</version>
5640
</dependency>
5741
<dependency>
5842
<groupId>io.prometheus</groupId>
5943
<artifactId>prometheus-metrics-exposition-formats</artifactId>
60-
<version>${prometheus.metrics.version}</version>
6144
</dependency>
6245
<dependency>
6346
<groupId>org.slf4j</groupId>
6447
<artifactId>slf4j-api</artifactId>
65-
<version>2.1.0-alpha1</version>
6648
</dependency>
6749
<dependency>
6850
<groupId>ch.qos.logback</groupId>
6951
<artifactId>logback-classic</artifactId>
70-
<version>1.5.32</version>
7152
</dependency>
7253
<dependency>
7354
<groupId>org.testcontainers</groupId>
7455
<artifactId>testcontainers</artifactId>
75-
<version>2.0.4</version>
7656
<exclusions>
7757
<exclusion>
7858
<groupId>org.apache.commons</groupId>
@@ -83,34 +63,28 @@
8363
<dependency>
8464
<groupId>org.apache.commons</groupId>
8565
<artifactId>commons-compress</artifactId>
86-
<version>1.28.0</version>
8766
</dependency>
8867
<dependency>
8968
<groupId>com.squareup.okhttp3</groupId>
9069
<artifactId>okhttp-jvm</artifactId>
91-
<version>5.3.2</version>
9270
</dependency>
9371
<dependency>
9472
<groupId>org.assertj</groupId>
9573
<artifactId>assertj-core</artifactId>
96-
<version>3.27.7</version>
9774
</dependency>
9875
<dependency>
9976
<groupId>io.prometheus</groupId>
10077
<artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
101-
<version>${prometheus.metrics.version}</version>
10278
<scope>test</scope>
10379
</dependency>
10480
<dependency>
10581
<groupId>org.yaml</groupId>
10682
<artifactId>snakeyaml</artifactId>
107-
<version>2.6</version>
10883
<scope>test</scope>
10984
</dependency>
11085
<dependency>
11186
<groupId>io.prometheus.jmx</groupId>
11287
<artifactId>jmx_example_application</artifactId>
113-
<version>1.5.0-post</version>
11488
<scope>test</scope>
11589
</dependency>
11690
</dependencies>
@@ -124,25 +98,7 @@
12498
</resources>
12599
<plugins>
126100
<plugin>
127-
<groupId>org.apache.maven.plugins</groupId>
128-
<artifactId>maven-resources-plugin</artifactId>
129-
<version>3.5.0</version>
130-
<configuration>
131-
<propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
132-
</configuration>
133-
</plugin>
134-
<plugin>
135-
<groupId>org.apache.maven.plugins</groupId>
136-
<artifactId>maven-compiler-plugin</artifactId>
137-
<version>3.15.0</version>
138-
<configuration>
139-
<compilerArgument>-Xbootclasspath/a:${env.JAVA_HOME}/lib/</compilerArgument>
140-
</configuration>
141-
</plugin>
142-
<plugin>
143-
<groupId>org.apache.maven.plugins</groupId>
144101
<artifactId>maven-clean-plugin</artifactId>
145-
<version>3.5.0</version>
146102
<configuration>
147103
<filesets>
148104
<fileset>
@@ -165,9 +121,7 @@
165121
</executions>
166122
</plugin>
167123
<plugin>
168-
<groupId>org.apache.maven.plugins</groupId>
169124
<artifactId>maven-surefire-plugin</artifactId>
170-
<version>3.5.5</version>
171125
<configuration>
172126
<skipTests>true</skipTests>
173127
</configuration>
@@ -188,7 +142,6 @@
188142
<plugin>
189143
<groupId>com.diffplug.spotless</groupId>
190144
<artifactId>spotless-maven-plugin</artifactId>
191-
<version>3.4.0</version>
192145
<configuration>
193146
<java>
194147
<palantirJavaFormat>
@@ -197,62 +150,8 @@
197150
</palantirJavaFormat>
198151
</java>
199152
</configuration>
200-
<executions>
201-
<execution>
202-
<phase>compile</phase>
203-
<goals>
204-
<goal>apply</goal>
205-
</goals>
206-
</execution>
207-
</executions>
208-
</plugin>
209-
<plugin>
210-
<groupId>org.apache.maven.plugins</groupId>
211-
<artifactId>maven-enforcer-plugin</artifactId>
212-
<version>3.6.2</version>
213-
<executions>
214-
<execution>
215-
<id>enforce-maven</id>
216-
<goals>
217-
<goal>enforce</goal>
218-
</goals>
219-
<configuration>
220-
<rules>
221-
<requireMavenVersion>
222-
<version>3.9.6</version>
223-
</requireMavenVersion>
224-
</rules>
225-
</configuration>
226-
</execution>
227-
</executions>
228-
</plugin>
229-
<plugin>
230-
<groupId>org.codehaus.mojo</groupId>
231-
<artifactId>versions-maven-plugin</artifactId>
232-
<version>2.21.0</version>
233-
<configuration>
234-
<rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
235-
</configuration>
236153
</plugin>
237154
</plugins>
238155
</build>
239156

240-
<profiles>
241-
<profile>
242-
<id>release</id>
243-
<build>
244-
<plugins>
245-
<plugin>
246-
<groupId>org.apache.maven.plugins</groupId>
247-
<artifactId>maven-deploy-plugin</artifactId>
248-
<version>3.1.4</version>
249-
<configuration>
250-
<skip>true</skip>
251-
</configuration>
252-
</plugin>
253-
</plugins>
254-
</build>
255-
</profile>
256-
</profiles>
257-
258-
</project>
157+
</project>

0 commit comments

Comments
 (0)