This is an automated email from the ASF dual-hosted git repository.

vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/main by this push:
     new 38fa0bbd56 QPID-8626: [Broker-J] Replaced deprecated options in 
pom.xml with new ones
38fa0bbd56 is described below

commit 38fa0bbd561cc168a9c9177f9bc043e30175929e
Author: Tomas Vavricka <vavr...@apache.org>
AuthorDate: Wed Aug 9 13:18:25 2023 +0200

    QPID-8626: [Broker-J] Replaced deprecated options in pom.xml with new ones
---
 broker-plugins/prometheus-exporter/pom.xml |  4 ----
 pom.xml                                    | 18 ++++--------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/broker-plugins/prometheus-exporter/pom.xml 
b/broker-plugins/prometheus-exporter/pom.xml
index 4910bd49e6..d47d06828f 100644
--- a/broker-plugins/prometheus-exporter/pom.xml
+++ b/broker-plugins/prometheus-exporter/pom.xml
@@ -40,10 +40,6 @@
             <groupId>org.apache.qpid</groupId>
             <artifactId>qpid-broker-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.prometheus</groupId>
-            <artifactId>simpleclient</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient_common</artifactId>
diff --git a/pom.xml b/pom.xml
index 4734ac9a0d..8f0a892110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -967,12 +967,7 @@
         <version>${bcpkix-version}</version>
       </dependency>
 
-      <!-- prometheus client dependencies -->
-      <dependency>
-        <groupId>io.prometheus</groupId>
-        <artifactId>simpleclient</artifactId>
-        <version>${prometheus-client-version}</version>
-      </dependency>
+      <!-- prometheus client dependency -->
       <dependency>
         <groupId>io.prometheus</groupId>
         <artifactId>simpleclient_common</artifactId>
@@ -990,7 +985,6 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven-compiler-plugin-version}</version>
           <configuration>
-            <optimize>true</optimize>
             <showDeprecation>true</showDeprecation>
             <showWarnings>true</showWarnings>
             <useIncrementalCompilation>false</useIncrementalCompilation>
@@ -1136,6 +1130,7 @@
           <systemPropertyVariables>
             <!-- Defaults -->
             <qpid.dest_syntax>BURL</qpid.dest_syntax>
+            <derby.stream.error.file>target/derby.log</derby.stream.error.file>
 
             <!-- Profile Based Values -->
             <profile>${profile}</profile>
@@ -1150,12 +1145,6 @@
             
<qpid.tests.mms.messagestore.persistence>${profile.qpid.tests.mms.messagestore.persistence}</qpid.tests.mms.messagestore.persistence>
             <java.io.tmpdir>${java.io.tmpdir}</java.io.tmpdir>
           </systemPropertyVariables>
-          <systemProperties>
-            <property>
-              <name>derby.stream.error.file</name>
-              <value>target/derby.log</value>
-            </property>
-          </systemProperties>
         </configuration>
       </plugin>
 
@@ -1680,7 +1669,8 @@
             <artifactId>license-maven-plugin</artifactId>
             <!-- version specified in pluginManagement -->
             <configuration>
-              <failIfWarning>true</failIfWarning>
+              <failOnMissing>true</failOnMissing>
+              <failOnBlacklist>true</failOnBlacklist>
               <excludedScopes>provided,test</excludedScopes>
               
<outputDirectory>${license-maven-plugin-output-dir}</outputDirectory>
               <!-- Exclude logback from being checked, it is dual licensed and 
lists both licenses in META-INF Bundle-License   -->


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to