[cloudsim] r254 committed - * Fixed the Java 8 and Maven integration problem (modules/cloudsim/pom...

4 views
Skip to first unread message

clou...@googlecode.com

unread,
Oct 15, 2014, 1:49:22 AM10/15/14
to cloudsim...@googlegroups.com
Revision: 254
Author: nikolay...@gmail.com
Date: Wed Oct 15 05:49:03 2014 UTC
Log: * 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

https://code.google.com/p/cloudsim/source/detail?r=254

Modified:
/trunk/modules/cloudsim/pom.xml
/trunk/pom.xml

=======================================
--- /trunk/modules/cloudsim/pom.xml Thu May 2 09:51:55 2013 UTC
+++ /trunk/modules/cloudsim/pom.xml Wed Oct 15 05:49:03 2014 UTC
@@ -9,6 +9,28 @@

<artifactId>cloudsim</artifactId>
<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>
<plugins>
@@ -25,33 +47,49 @@
</goals>
</execution>
</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>
</plugins>
</build>

<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.11</version>
- </plugin>
- </plugins>
- </reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.maven.plugin</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.11</version>
+ </plugin>
+ </plugins>
+ </reporting>

</project>
Reply all
Reply to author
Forward
0 new messages