Updated POMs to use newer site plugin - compatibility problems with n…

…ewer version of maven
usnistgov · Sep 5, 2018 · 103e1ae · 103e1ae
1 parent 7b463d8
commit 103e1ae
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 51 deletions.
diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,55 @@
         </profile>
     </profiles>
 
-
+    <!--<reporting>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-project-info-reports-plugin</artifactId>-->
+                <!--<version>3.0.0</version>-->
+                <!--<reportSets>-->
+                  <!--<reportSet>-->
+                    <!--<reports>-->
+                        <!--<report>index</report>-->
+                        <!--<report>licenses</report>-->
+                        <!--<report>dependency-info</report>-->
+                    <!--</reports>-->
+                  <!--</reportSet>-->
+                <!--</reportSets>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
+    <!--</reporting>-->
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                    <!--<dependencyLocationsEnabled>false</dependencyLocationsEnabled>-->
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>dependencies</report>
+                            <report>scm</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>3.0.0</version>
+            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-javadoc-plugin</artifactId>-->
+                <!--<version>3.0.0</version>-->
+            <!--</plugin>-->
+        </plugins>
+    </reporting>
 
     <build>
         <outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
@@ -167,6 +215,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>${maven-site-plugin-version}</version>
+            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-project-info-reports-plugin</artifactId>-->
+                <!--<version>2.7</version>-->
+            <!--</plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>

diff --git a/tk-deps/pom.xml b/tk-deps/pom.xml
@@ -44,6 +44,7 @@
         <spring_version>4.3.6.RELEASE</spring_version>
         <thymeleaf-version>3.0.2.RELEASE</thymeleaf-version>
         <lucene-version>5.5.5</lucene-version>
+        <maven-site-plugin-version>3.7.1</maven-site-plugin-version>  <!-- 3.7.1  3.5-->
         <!--<lucene-version>6.6.0</lucene-version>-->
     </properties>
 

diff --git a/xdstools2/pom.xml b/xdstools2/pom.xml
@@ -73,54 +73,6 @@
 			</properties>
 		</profile>
 
-		<!--<profile>-->
-			<!--<id>Diane</id>-->
-			<!--<properties>-->
-				<!--<build.profile.id>Diane</build.profile.id>-->
-			<!--</properties>-->
-
-			<!--<build>-->
-				<!--<plugins>-->
-					<!--<plugin>-->
-						<!--<groupId>org.apache.maven.plugins</groupId>-->
-						<!--<artifactId>maven-jar-plugin</artifactId>-->
-						<!--<executions>-->
-							<!--<execution>-->
-								<!--<id>make-a-jar</id>-->
-								<!--<phase>compile</phase>-->
-								<!--<goals>-->
-									<!--<goal>jar</goal>-->
-								<!--</goals>-->
-							<!--</execution>-->
-						<!--</executions>-->
-					<!--</plugin>-->
-
-					<!--<plugin>-->
-						<!--<groupId>org.apache.maven.plugins</groupId>-->
-						<!--<artifactId>maven-install-plugin</artifactId>-->
-						<!--<executions>-->
-							<!--<execution>-->
-								<!--<phase>install</phase>-->
-								<!--<goals>-->
-									<!--<goal>install-file</goal>-->
-								<!--</goals>-->
-								<!--<configuration>-->
-									<!--<packaging>jar</packaging>-->
-									<!--<artifactId>${project.artifactId}</artifactId>-->
-									<!--<groupId>${project.groupId}</groupId>-->
-									<!--<version>${project.version}</version>-->
-									<!--<file>-->
-										<!--${project.build.directory}/${project.artifactId}-${project.version}.jar-->
-									<!--</file>-->
-								<!--</configuration>-->
-							<!--</execution>-->
-						<!--</executions>-->
-					<!--</plugin>-->
-				<!--</plugins>-->
-			<!--</build>-->
-		<!--</profile>-->
-
-
 		<profile>
 			<id>site</id>
 			<activation>
@@ -146,6 +98,11 @@
 								<artifactId>doxia-module-markdown</artifactId>
 								<version>1.5</version>
 							</dependency>
+							<dependency>
+								<groupId>org.apache.maven.plugins</groupId>
+								<artifactId>maven-project-info-reports-plugin</artifactId>
+								<version>3.0.0</version>
+							</dependency>
 						</dependencies>
 						<executions>
 							<execution>
@@ -572,15 +529,15 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>3.3</version>
+				<version>${maven-site-plugin-version}</version>
 				<configuration>
 					<port>8181</port>
 				</configuration>
 				<dependencies>
 					<dependency>
 						<groupId>org.apache.maven.doxia</groupId>
 						<artifactId>doxia-module-markdown</artifactId>
-						<version>1.5</version>
+						<version>1.8</version>
 					</dependency>
 				</dependencies>
 			</plugin>