Skip to content

G
gpucloudsim
Commit 8670471c authored by Nikolay's avatar Nikolay
Browse files
Options

* Fixed the Java 8 and Maven integration problem (modules/cloudsim/pom.xml) 

* Set the Java source version to 6 in the main pom.xml, for consistency
parent ec259845
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 24 deletions
modules/cloudsim/pom.xml
View file @ 8670471c
...@@ -9,6 +9,28 @@ ...@@ -9,6 +9,28 @@
<artifactId>cloudsim</artifactId> <artifactId>cloudsim</artifactId>
<name>cloudsim</name> <name>cloudsim</name>
<!-- Switch OFF the docling in Java 8 -->
<profiles>
<profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<!-- ===================================== -->
<build> <build>
<plugins> <plugins>
...@@ -25,33 +47,49 @@ ...@@ -25,33 +47,49 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration>
<!-- failOnError>false</failOnError -->
<tags>
<tag>
<name>pre</name>
<placement>a</placement>
<head>Precondition:</head>
</tag>
<tag>
<name>post</name>
<placement>a</placement>
<head>Postcondition:</head>
</tag>
</tags>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version> <version>2.8</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version> <version>2.3</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.sonatype.maven.plugin</groupId> <groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId> <artifactId>emma-maven-plugin</artifactId>
<version>1.2</version> <version>1.2</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-surefire-report-plugin</artifactId>
<version>2.11</version> <version>2.11</version>
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>
</project> </project>
pom.xml
View file @ 8670471c
...@@ -116,4 +116,4 @@ ...@@ -116,4 +116,4 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment