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/15 16:36:17 UTC
svn commit: r1679573 - in /myfaces/tobago/trunk: pom.xml tobago-core/pom.xml
Author: deki
Date: Fri May 15 14:36:17 2015
New Revision: 1679573
URL: http://svn.apache.org/r1679573
Log:
TOBAGO-1460: separate profile for code generation with JDK>1.6
Modified:
myfaces/tobago/trunk/pom.xml
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=1679573&r1=1679572&r2=1679573&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Fri May 15 14:36:17 2015
@@ -836,7 +836,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>3.3</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1679573&r1=1679572&r2=1679573&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Fri May 15 14:36:17 2015
@@ -48,47 +48,10 @@
</executions>
</plugin>
<plugin>
- <groupId>org.bsc.maven</groupId>
- <artifactId>maven-processor-plugin</artifactId>
- <executions>
- <execution>
- <id>process</id>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <!-- source output directory -->
- <outputDirectory>${project.build.directory}/generated</outputDirectory>
- <processors>
- <processor>org.apache.myfaces.tobago.apt.processor.ClassesGenerator</processor>
- <processor>org.apache.myfaces.tobago.apt.processor.TaglibGenerator</processor>
- <processor>org.apache.myfaces.tobago.apt.processor.FacesConfigGenerator</processor>
- <processor>org.apache.myfaces.tobago.apt.processor.CheckstyleConfigGenerator</processor>
- </processors>
- <optionMap>
- <sourceFacesConfig>${basedir}/src/main/faces-config/faces-config.xml</sourceFacesConfig>
- <targetFacesConfig>META-INF/faces-config.xml</targetFacesConfig>
- <targetTaglib>META-INF</targetTaglib>
- <targetCheckstyle>META-INF</targetCheckstyle>
- <jsfVersion>${jsf.target}</jsfVersion>
- </optionMap>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <compilerArgument>-proc:none</compilerArgument>
+ <proc>none</proc>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
<encoding>${maven.compile.encoding}</encoding>
@@ -263,6 +226,103 @@
</dependencies>
</profile>
<profile>
+ <id>codegen-old-jdk</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.bsc.maven</groupId>
+ <artifactId>maven-processor-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <!-- source output directory -->
+ <outputDirectory>${project.build.directory}/generated</outputDirectory>
+ <processors>
+ <processor>org.apache.myfaces.tobago.apt.processor.ClassesGenerator</processor>
+ <processor>org.apache.myfaces.tobago.apt.processor.TaglibGenerator</processor>
+ <processor>org.apache.myfaces.tobago.apt.processor.FacesConfigGenerator</processor>
+ <processor>org.apache.myfaces.tobago.apt.processor.CheckstyleConfigGenerator</processor>
+ </processors>
+ <optionMap>
+ <sourceFacesConfig>${basedir}/src/main/faces-config/faces-config.xml</sourceFacesConfig>
+ <targetFacesConfig>META-INF/faces-config.xml</targetFacesConfig>
+ <targetTaglib>META-INF</targetTaglib>
+ <targetCheckstyle>META-INF</targetCheckstyle>
+ <jsfVersion>${jsf.target}</jsfVersion>
+ </optionMap>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>codegen-recent-jdk</id>
+ <activation>
+ <jdk>!1.6</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <!-- https://issues.apache.org/jira/browse/MCOMPILER-168 -->
+ <source>1.6</source>
+ <target>1.6</target>
+ <proc>only</proc>
+ <!-- source output directory -->
+ <generatedSourcesDirectory>${project.build.directory}/generated</generatedSourcesDirectory>
+ <annotationProcessors>
+ <annotationProcessor>org.apache.myfaces.tobago.apt.processor.ClassesGenerator</annotationProcessor>
+ <annotationProcessor>org.apache.myfaces.tobago.apt.processor.TaglibGenerator</annotationProcessor>
+ <annotationProcessor>org.apache.myfaces.tobago.apt.processor.FacesConfigGenerator</annotationProcessor>
+ <annotationProcessor>org.apache.myfaces.tobago.apt.processor.CheckstyleConfigGenerator</annotationProcessor>
+ </annotationProcessors>
+ <compilerArgs>
+ <arg>-AsourceFacesConfig=${basedir}/src/main/faces-config/faces-config.xml</arg>
+ <arg>-AtargetFacesConfig=META-INF/faces-config.xml</arg>
+ <arg>-AtargetTaglib=META-INF</arg>
+ <arg>-AtargetCheckstyle=META-INF</arg>
+ <arg>-AjsfVersion=${jsf.target}</arg>
+ </compilerArgs>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>apache-release</id>
<build>
<plugins>