From 1e9c10d951f3a35a9bfaa1421fff059054cecfe8 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 14 Sep 2022 20:22:14 +0200
Subject: [PATCH 1/2] [MRESOLVER-272] Update parent POM

Remove version overrides and update bnd plugin
as well.

---

https://issues.apache.org/jira/browse/MRESOLVER-272
---
 pom.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60581e281..239b751d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>36</version>
+    <version>37</version>
     <relativePath />
   </parent>
 
@@ -381,7 +381,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M6</version>
           <configuration>
             <argLine>-Xmx128m</argLine>
             <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
@@ -393,7 +392,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.0.0-M6</version>
           <configuration>
             <failIfNoTests>false</failIfNoTests>
             <argLine>-Xmx128m</argLine>
@@ -440,7 +438,7 @@
         <plugin>
           <groupId>biz.aQute.bnd</groupId>
           <artifactId>bnd-maven-plugin</artifactId>
-          <version>6.2.0</version>
+          <version>6.3.1</version>
           <executions>
             <execution>
               <id>bnd-process</id>

From ecfdf080c0bc519b829257e88707dcca45307eed Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 16 Sep 2022 16:23:29 +0200
Subject: [PATCH 2/2] Add ignore for gitattributes

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 239b751d0..c32785853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,7 +431,7 @@
               <exclude>src/test/resources/**/*.ini</exclude>
               <exclude>src/test/resources/**/*.txt</exclude>
               <exclude>src/test/resources/ssl/*-store</exclude>
-              <exclude>.travis.yml</exclude>
+              <exclude>.gitattributes</exclude>
             </excludes>
           </configuration>
         </plugin>