You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2015/06/09 11:07:52 UTC
svn commit: r1684359 - in /myfaces/tobago/trunk: pom.xml
src/site/apt/release-checklist.apt tobago-core/pom.xml
Author: deki
Date: Tue Jun 9 09:07:52 2015
New Revision: 1684359
URL: http://svn.apache.org/r1684359
Log:
fixed site build
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/src/site/apt/release-checklist.apt
myfaces/tobago/trunk/tobago-core/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1684359&r1=1684358&r2=1684359&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Tue Jun 9 09:07:52 2015
@@ -347,7 +347,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
+ <version>2.8</version>
<reportSets>
<reportSet>
<reports>
@@ -839,6 +839,7 @@
<target>${maven.compile.target}</target>
<encoding>${maven.compile.encoding}</encoding>
<showWarnings>true</showWarnings>
+ <useIncrementalCompilation>false</useIncrementalCompilation><!-- see MCOMPILER-209 and MCOMPILER-235 -->
<!--fork>true</fork-->
<!-- <compilerArgument>-Xlint:all,-serial,-fallthrough</compilerArgument>-->
</configuration>
@@ -846,7 +847,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: myfaces/tobago/trunk/src/site/apt/release-checklist.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/release-checklist.apt?rev=1684359&r1=1684358&r2=1684359&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/release-checklist.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/release-checklist.apt Tue Jun 9 09:07:52 2015
@@ -112,7 +112,7 @@ svn co https://svn.apache.org/repos/asf/
svn co https://svn.apache.org/repos/asf/myfaces/site/publish/tobago tobago-publish
cd tobago
export MAVEN_OPTS="-Xmx1500m -XX:MaxPermSize=512m ${MAVEN_OPTS}"
-mvn package
+mvn package -Pattach-source
mvn site:site
mvn site:stage -DstagingDirectory=/Volumes/tobago-site/tobago-publish
+------------------------+
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1684359&r1=1684358&r2=1684359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Tue Jun 9 09:07:52 2015
@@ -30,24 +30,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -56,6 +38,7 @@
<target>${maven.compile.target}</target>
<encoding>${maven.compile.encoding}</encoding>
<showWarnings>true</showWarnings>
+ <useIncrementalCompilation>false</useIncrementalCompilation><!-- see MCOMPILER-209 and MCOMPILER-235 -->
<!-- <compilerArgument>-Xlint:all,-serial,-fallthrough</compilerArgument>-->
</configuration>
</plugin>
@@ -293,6 +276,7 @@
<source>1.6</source>
<target>1.6</target>
<proc>only</proc>
+ <useIncrementalCompilation>false</useIncrementalCompilation><!-- see MCOMPILER-209 and MCOMPILER-235 -->
<!-- source output directory -->
<generatedSourcesDirectory>${project.build.directory}/generated</generatedSourcesDirectory>
<annotationProcessors>