fix: trim profile id element to match profile ids

qoomon · Feb 15, 2023 · d45c1f0 · d45c1f0
1 parent 68565c5
commit d45c1f0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 # Changelog
 
+## 9.6.3
+
+##### Fixes
+- fix null pointer exception if profile id has leading or trailing whitespaces #239
+
+
 ## 9.6.2
 
 ##### Fixes

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.2</version>
+        <version>9.6.3</version>
     </extension>
 
 </extensions>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.6.2</version>
+    <version>9.6.3</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -1309,7 +1309,8 @@ private void updateProfiles(Element projectElement, List<Profile> profiles) {
             Map<String, Profile> profileMap = profiles.stream()
                     .collect(toMap(Profile::getId, it -> it));
             for (Element profileElement : profilesElement.getChildren("profile")) {
-                Profile profile = profileMap.get(profileElement.getChild("id").getText());
+                String profileId = profileElement.getChild("id").getText().trim();
+                Profile profile = profileMap.get(profileId);
                 updatePropertyValues(profileElement, profile);
                 updateDependencyVersions(profileElement, profile);
                 updatePluginVersions(profileElement, profile.getBuild(), profile.getReporting());

diff --git a/src/test/resources/testProjects/standardProject/pom.xml b/src/test/resources/testProjects/standardProject/pom.xml
@@ -94,8 +94,14 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+
     </build>
 
+    <profiles>
+        <profile>
+            <id>foo </id>
+        </profile>
+    </profiles>
 </project>
 
 <!--mvn install -Dmaven.repo.local=$PWD/.m2/repository-->