Author: echatellier Date: 2013-04-19 11:05:35 +0200 (Fri, 19 Apr 2013) New Revision: 205 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/205 Log: Fix code formater configuration without assembly Removed: trunk/assembly/ Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-19 08:57:55 UTC (rev 204) +++ trunk/pom.xml 2013-04-19 09:05:35 UTC (rev 205) @@ -185,37 +185,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${version.maven-surefire-plugin}</version> </plugin> - <!-- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${version.maven-dependency-plugin}</version> - <executions> - <execution> - <id>unpack-code-formatter-conf</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>nc.ird</groupId> - <artifactId>cantharella</artifactId> - <version>${project.version}</version> - <type>zip</type> - <classifier>code-formatter-conf</classifier> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}</outputDirectory> - <includes>**/*.xml</includes> - </artifactItem> - </artifactItems> - <includes>**/*</includes> - <overWriteReleases>true</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>com.googlecode.maven-java-formatter-plugin</groupId> <artifactId>maven-java-formatter-plugin</artifactId> @@ -229,17 +198,17 @@ </execution> </executions> <configuration> - <!- - Use plugin to compiler config vice those in formatter config file - -> + <!-- Use plugin to compiler config vice those in formatter config file --> <overrideConfigCompilerVersion>true</overrideConfigCompilerVersion> <compilerSource>${jdk.version}</compilerSource> <compilerCompliance>${jdk.version}</compilerCompliance> <compilerTargetPlatform>${jdk.version}</compilerTargetPlatform> - <!- - Use Unix line endings - -> + <!-- Use Unix line endings --> <lineEnding>LF</lineEnding> - <!- - The formatter config file - -> - <configFile>${project.build.directory}/code-format.xml</configFile> + <!-- The formatter config file --> + <configFile>${basedir}/../src/code-formatter-conf/code-format.xml</configFile> </configuration> - </plugin>--> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> @@ -252,30 +221,7 @@ </configuration> </plugin> </plugins> - </pluginManagement> - <!-- <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <descriptors> - <descriptor> - ${project.basedir}/assembly/code-formatter-conf.xml - </descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> --> </build> <dependencyManagement>