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/05/20 10:41:49 UTC
svn commit: r1680489 - in /myfaces/tobago/branches/tobago-3.0.x: pom.xml
tobago-core/pom.xml tobago-extension/tobago-sandbox/pom.xml
Author: deki
Date: Wed May 20 08:41:49 2015
New Revision: 1680489
URL: http://svn.apache.org/r1680489
Log:
Revert: TOBAGO-1460: generate-sources ran twice, fix for MSOURCES-8
Modified:
myfaces/tobago/branches/tobago-3.0.x/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml
Modified: myfaces/tobago/branches/tobago-3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/pom.xml?rev=1680489&r1=1680488&r2=1680489&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/pom.xml Wed May 20 08:41:49 2015
@@ -789,7 +789,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.1</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -1068,7 +1068,7 @@
<execution>
<id>attach-sources</id>
<goals>
- <goal>jar-no-fork</goal>
+ <goal>jar</goal>
</goals>
</execution>
</executions>
@@ -1138,7 +1138,7 @@
<executions>
<execution>
<id>attach-source</id>
- <goals><goal>jar-no-fork</goal></goals>
+ <goals><goal>jar</goal></goals>
</execution>
</executions>
</plugin>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml?rev=1680489&r1=1680488&r2=1680489&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml Wed May 20 08:41:49 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>
@@ -135,7 +117,7 @@
<executions>
<execution>
<id>attach-source</id>
- <goals><goal>jar-no-fork</goal></goals>
+ <goals><goal>jar</goal></goals>
</execution>
</executions>
</plugin>
@@ -272,7 +254,7 @@
<executions>
<execution>
<id>attach-source</id>
- <goals><goal>jar-no-fork</goal></goals>
+ <goals><goal>jar</goal></goals>
</execution>
</executions>
</plugin>
@@ -289,7 +271,7 @@
<executions>
<execution>
<id>attach-source</id>
- <goals><goal>jar-no-fork</goal></goals>
+ <goals><goal>jar</goal></goals>
</execution>
</executions>
</plugin>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml?rev=1680489&r1=1680488&r2=1680489&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml Wed May 20 08:41:49 2015
@@ -265,7 +265,7 @@
<executions>
<execution>
<id>attach-source</id>
- <goals><goal>jar-no-fork</goal></goals>
+ <goals><goal>jar</goal></goals>
</execution>
</executions>
</plugin>
@@ -282,7 +282,7 @@
<executions>
<execution>
<id>attach-source</id>
- <goals><goal>jar-no-fork</goal></goals>
+ <goals><goal>jar</goal></goals>
</execution>
</executions>
</plugin>