diff options
| author | lgoubet | 2012-10-02 08:18:26 +0000 |
|---|---|---|
| committer | lgoubet | 2012-10-02 08:37:13 +0000 |
| commit | 60fac7ed5c1b414c35dc3e0f7e3fe77f3417215e (patch) | |
| tree | 84e6b39c19ca1f0eb90614a6bdef53b6dd1c450b | |
| parent | 2ed3a23a08fab779053eeaf3dc73ca13dfc0d141 (diff) | |
| download | org.eclipse.emf.compare-60fac7ed5c1b414c35dc3e0f7e3fe77f3417215e.tar.gz org.eclipse.emf.compare-60fac7ed5c1b414c35dc3e0f7e3fe77f3417215e.tar.xz org.eclipse.emf.compare-60fac7ed5c1b414c35dc3e0f7e3fe77f3417215e.zip | |
Remove the workaround to build against Java 5. We have fixed the source
incompatibility.
| -rw-r--r-- | org.eclipse.emf.compare-parent/pom.xml | 115 |
1 files changed, 53 insertions, 62 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml index b9abc7ad9..0e01fd56f 100644 --- a/org.eclipse.emf.compare-parent/pom.xml +++ b/org.eclipse.emf.compare-parent/pom.xml @@ -200,68 +200,59 @@ <version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
- <!--
- All of the following can be removed when switching to java 6.
- In short, one of the classes we compile has a source incompatibility with the JDK6 and thus cannot be
- compiled with it. The compiled file is binary compatible with the jdk 6 though.
- -->
- <compilerId>jdt</compilerId>
- <compilerArguments>
- <bootclasspath>/shared/common/jdk-1.5.0-22.x86_64/jre/lib/rt.jar</bootclasspath>
- </compilerArguments>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <encoding>ISO-8859-1</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- <format>xml</format>
- <failOnViolation>false</failOnViolation>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>cpd-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-</plugins>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <encoding>ISO-8859-1</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <failOnError>false</failOnError>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ <format>xml</format>
+ <failOnViolation>false</failOnViolation>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>cpd-check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
|