Merge branch 'master' of https://github.com/eclipse/birt

franczx · Jun 1, 2016 · 6d41930 · 6d41930
2 parents e1e4913 + a955cfa
commit 6d41930
Show file tree

Hide file tree

Showing 9 changed files with 1,305 additions and 1,312 deletions.
diff --git a/features/org.eclipse.birt.chart.cshelp.feature/feature.properties b/features/org.eclipse.birt.chart.cshelp.feature/feature.properties
diff --git a/features/org.eclipse.birt.cshelp.feature/feature.properties b/features/org.eclipse.birt.cshelp.feature/feature.properties
diff --git a/features/org.eclipse.birt.doc.feature/feature.properties b/features/org.eclipse.birt.doc.feature/feature.properties
diff --git a/features/org.eclipse.birt.example.feature/feature.properties b/features/org.eclipse.birt.example.feature/feature.properties
diff --git a/features/org.eclipse.birt.feature/feature.properties b/features/org.eclipse.birt.feature/feature.properties
diff --git a/features/org.eclipse.birt.osgi.runtime.sdk/feature.properties b/features/org.eclipse.birt.osgi.runtime.sdk/feature.properties
diff --git a/features/org.eclipse.birt.osgi.runtime/feature.properties b/features/org.eclipse.birt.osgi.runtime/feature.properties
diff --git a/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/feature.properties b/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/feature.properties
diff --git a/pom.xml b/pom.xml
@@ -172,7 +172,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.18.1</version>
+ <version>2.19.1</version>
  <configuration>
  <aggregate>true</aggregate>
  </configuration>
@@ -379,13 +379,6 @@
  <groupId>org.eclipse.tycho</groupId>
  <artifactId>tycho-surefire-plugin</artifactId>
  <version>${tycho.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit3</artifactId>
- <version>2.18.1</version>
- </dependency>
- </dependencies>
 <!-- Exclude integration tests that may hang or cause other occasional delays
  in integration test. Uncomment the following config block to disable these
  tests temporarely. -->