From: liamfallon <liam.fallon@est.tech>
Date: Fri, 16 Sep 2022 19:06:13 +0000 (+0100)
Subject: Fix minor warnings in code
X-Git-Tag: 3.6.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fparent.git;a=commitdiff_plain;h=7c5702fdc7e93ea5031834cc6924a2d85c520a14

Fix minor warnings in code

Issue-ID: POLICY-4045
Change-Id: I34d596517bd84accd8916973b93d90c159460a5e
Signed-off-by: liamfallon <liam.fallon@est.tech>
---

diff --git a/integration/pom.xml b/integration/pom.xml
index 5df4aae7..ecbb83f9 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <java.version>11</java.version>
-        <!-- NOTE: For RELEASE/SNAPSHOT always set to the project version -->
+        <!-- Note Well: For RELEASE/SNAPSHOT always set to the project version -->
         <version.parent.resources>3.5.3</version.parent.resources>
         <version.logback>1.2.11</version.logback>
         <version.dmaap>1.1.12</version.dmaap>
@@ -988,6 +988,20 @@
                                                 <ignore />
                                             </action>
                                         </pluginExecution>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>org.apache.maven.plugins</groupId>
+                                                <artifactId>maven-remote-resources-plugin</artifactId>
+                                                <versionRange>3.0.0,)</versionRange>
+                                                <goals>
+                                                    <goal>bundle</goal>
+                                                    <goal>process</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <ignore />
+                                            </action>
+                                        </pluginExecution>
                                         <pluginExecution>
                                             <pluginExecutionFilter>
                                                 <groupId>org.jacoco</groupId>
diff --git a/pom.xml b/pom.xml
index 743312f6..661e1dc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
 
                 Be sure to override ${project.parent.basedir} in order to find the XML file
 
-                mvn formatter:format spotless:apply process-sources -Dproject.parent.basedir=TODO
+                mvn formatter:format spotless:apply process-sources -Dproject.parent.basedir=<basedir>
                 -->
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
diff --git a/resources/pom.xml b/resources/pom.xml
index 4ee50911..3c89b407 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -16,8 +16,10 @@
   ============LICENSE_END=========================================================
   -->
 
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd"
+>
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -29,4 +31,47 @@
     <artifactId>policy-parent-resources</artifactId>
     <description>Resources used in builds</description>
     <packaging>jar</packaging>
+
+    <profiles>
+        <profile>
+            <id>m2e</id>
+            <!-- This profile is only active when the property "m2e.version" is set,
+                which is the case when building in Eclipse with m2e. -->
+            <activation>
+                <property>
+                    <name>m2e.version</name>
+                </property>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.eclipse.m2e</groupId>
+                            <artifactId>lifecycle-mapping</artifactId>
+                            <version>1.0.0</version>
+                            <configuration>
+                                <lifecycleMappingMetadata>
+                                    <pluginExecutions>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>org.apache.maven.plugins</groupId>
+                                                <artifactId>maven-checkstyle-plugin</artifactId>
+                                                <versionRange>2.17,)</versionRange>
+                                                <goals>
+                                                    <goal>check</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <ignore />
+                                            </action>
+                                        </pluginExecution>
+                                    </pluginExecutions>
+                                </lifecycleMappingMetadata>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 </project>