Merge pull request #751 from NASA-PDS/i750

Update maven to support latest java version
NASA-PDS · Apr 5, 2024 · 15e1549 · 15e1549
2 parents 847699b + c73a9a2
commit 15e1549
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/branch-cicd.yaml b/.github/workflows/branch-cicd.yaml
@@ -62,11 +62,7 @@ jobs:
                     java-version: ${{matrix.java-version}}
             -
                 name: 🩺 Test Software
-                run: mvn package
-
-            -
-                name: 🩺 Test Site
-                run: mvn clean site
+                run: mvn site package
 
             -
                 name: ∫ Smoke Tests with Discipline LDDs

diff --git a/model-ontology/pom.xml b/model-ontology/pom.xml
@@ -111,24 +111,28 @@ POSSIBILITY OF SUCH DAMAGE.
                 </execution>
             </executions>
             </plugin>
-            <plugin>
-                <groupId>gov.nasa.pds.model</groupId>
-                <artifactId>model-dmdocument</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <ontologySrc>${basedir}/src/ontology</ontologySrc>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>generateDocumentation</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
+        <pluginManagement>
+			<plugins>
+				<plugin>
+	                <groupId>gov.nasa.pds.model</groupId>
+	                <artifactId>model-dmdocument</artifactId>
+	                <version>${project.version}</version>
+	                <configuration>
+	                    <ontologySrc>${basedir}/src/ontology</ontologySrc>
+	                </configuration>
+	                <executions>
+	                    <execution>
+	                        <id>default-compile</id>
+	                        <phase>compile</phase>
+	                        <goals>
+	                            <goal>generateDocumentation</goal>
+	                        </goals>
+	                    </execution>
+	                </executions>
+            	</plugin>
+            </plugins>
+		</pluginManagement>
     </build>
 
   <!-- Inherit from parent -->