Skip to content

clean up maven #1145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeitlinger merged 2 commits into from
Oct 11, 2024
Merged

clean up maven #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ba3e7a
clean up maven
zeitlinger Oct 11, 2024
cd1baca
clean up maven
zeitlinger Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
Part of a distributed "Hello, World" REST service to show Exemplars with OpenTelemetry's distributed tracing
</description>

<properties>
<java.version>17</java.version>
</properties>

<dependencies>
<dependency>
<groupId>io.prometheus</groupId>
Expand All @@ -41,19 +45,6 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>17</release>
<source>17</source>
<target>17</target>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/io/prometheus/metrics/examples/otel_exemplars/greeting/GreetingServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public GreetingServlet() {
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
long start = System.nanoTime();
try {
Thread.sleep((long) (Math.abs((random.nextGaussian() + 1.0) * 100.0)));
Thread.sleep((long) Math.abs((random.nextGaussian() + 1.0) * 100.0));
resp.setStatus(200);
resp.setContentType("text/plain");
resp.getWriter().println("Hello, World!");
Expand Down
17 changes: 4 additions & 13 deletions examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
Part of a distributed "Hello, World" REST service to show Exemplars with OpenTelemetry's distributed tracing
</description>

<properties>
<java.version>17</java.version>
</properties>

<dependencies>
<dependency>
<groupId>io.prometheus</groupId>
Expand All @@ -41,19 +45,6 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>17</release>
<source>17</source>
<target>17</target>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...pp/src/main/java/io/prometheus/metrics/examples/otel_exemplars/app/HelloWorldServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public HelloWorldServlet() {
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
long start = System.nanoTime();
try {
Thread.sleep((long) (Math.abs((random.nextGaussian() + 1.0) * 100.0)));
Thread.sleep((long) Math.abs((random.nextGaussian() + 1.0) * 100.0));
String greeting = executeGreetingServiceRequest();
resp.setStatus(200);
resp.setContentType("text/plain");
Expand Down
16 changes: 4 additions & 12 deletions examples/example-exemplars-tail-sampling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,12 @@
Example project showing Examplars with OpenTelemetry's Tail Sampling.
</description>

<properties>
<java.version>11</java.version>
</properties>

<modules>
<module>example-greeting-service</module>
<module>example-hello-world-app</module>
</modules>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
17 changes: 4 additions & 13 deletions examples/example-exporter-servlet-tomcat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
Prometheus Metrics Example using Embedded Tomcat and the Exporter Servlet
</description>

<properties>
<java.version>17</java.version>
</properties>

<dependencies>
<dependency>
<groupId>io.prometheus</groupId>
Expand All @@ -41,19 +45,6 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>17</release>
<source>17</source>
<target>17</target>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/HelloWorldServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public HelloWorldServlet() {
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
long start = System.nanoTime();
try {
Thread.sleep((long) (Math.abs((random.nextGaussian() + 1.0) * 100.0)));
Thread.sleep((long) Math.abs((random.nextGaussian() + 1.0) * 100.0));
resp.setStatus(200);
resp.setContentType("text/plain");
resp.getWriter().println("Hello, World!");
Expand Down
17 changes: 4 additions & 13 deletions integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
Tomcat Sample for the Exporter Integration Test
</description>

<properties>
<java.version>17</java.version>
</properties>

<dependencies>
<dependency>
<groupId>io.prometheus</groupId>
Expand All @@ -36,19 +40,6 @@
<build>
<finalName>exporter-servlet-tomcat-sample</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>17</release>
<source>17</source>
<target>17</target>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<automatic.module.name>--module-name-need-to-be-overriden--</automatic.module.name>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<otel.version>1.42.1</otel.version>
<java.version>8</java.version>
</properties>

<licenses>
Expand Down Expand Up @@ -270,9 +271,9 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>8</release>
<source>8</source>
<target>8</target>
<release>${java.version}</release>
<source>${java.version}</source>
<target>${java.version}</target>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:all</arg>
Expand Down
20 changes: 1 addition & 19 deletions prometheus-metrics-exporter-servlet-jakarta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<properties>
<automatic.module.name>io.prometheus.metrics.exporter.servlet.jakarta</automatic.module.name>
<java.version>17</java.version>
</properties>

<dependencies>
Expand All @@ -34,23 +35,4 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>17</release>
<source>17</source>
<target>17</target>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>

</project>