X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=pom.xml;h=75cbda38e96dc699380054a21812531f5fbec95e;hb=b71189e03c0c31311991183d2c0607e420bef4fc;hp=44c5e9b8cbfd484b14a946e41e0a681d1db51a7b;hpb=9541b578d0d394834cefd67a9930d4eecadfa82d;p=deliverable%2Ftracecompass.git
diff --git a/pom.xml b/pom.xml
index 44c5e9b8cb..75cbda38e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,12 @@
4.0.0
- 3.0
+ ${required-maven-version}
org.eclipse.tracecompass
org.eclipse.tracecompass
- 2.0.0-SNAPSHOT
+ 2.1.0-SNAPSHOT
pom
Trace Compass Parent
@@ -38,15 +38,19 @@
+ 3.3
UTF-8
UTF-8
+
- 0.24.0
- 0.24.0
+ 0.26.0
+ 0.26.0
scm:git:git://git.eclipse.org/gitroot/tracecompass/org.eclipse.tracecompass.git
- tracecompass-e4.5
+ 1.1.3
+ tracecompass-e4.6
http://download.eclipse.org/eclipse/updates/4.5
+ 2.1.0
0
@@ -57,7 +61,7 @@
1.8
**/tests/**,**/test/**,**/stubs/**,**/Messages*,**/alltests/**
org.eclipse.tracecompass.ctf.parser,org.eclipse.tracecompass.examples
- e1,e2,e3,e4,e5,e6
+ e1,e2,e3,e4,e5,e6,e7,e8
findbugs:NP_STORE_INTO_NONNULL_FIELD
**/*.java
findbugs:RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE
@@ -70,6 +74,10 @@
**/*.java
findbugs:NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR
**/*.java
+ findbugs:NP_NULL_PARAM_DEREF
+ **/*.java
+ findbugs:RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE
+ **/*.java
@@ -86,6 +94,16 @@
JBoss Public Repository Group
http://repository.jboss.org/nexus/content/groups/public/
+
+ rcptt-snapshots
+ RCPTT Maven Snapshots repository
+ https://repo.eclipse.org/content/repositories/rcptt-snapshots/
+
+
+ rcptt-releases
+ RCPTT Maven repository
+ https://repo.eclipse.org/content/repositories/rcptt-releases/
+
@@ -112,7 +130,7 @@
org.eclipse.cbi.maven.plugins
eclipse-jarsigner-plugin
- 1.1.2
+ ${cbi-plugins.version}
sign
@@ -142,6 +160,53 @@
+
+ use-jacoco
+
+
+ !skip-jacoco
+
+
+
+ ${tycho.testArgLine}
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.7.7.201606060606
+
+
+ pre-test
+
+ prepare-agent
+
+
+
+ ${sonar.jacoco.reportPath}
+
+ org.eclipse.tracecompass.*
+
+ true
+
+
+
+ post-test
+ post-integration-test
+
+ report
+
+
+ ${sonar.jacoco.reportPath}
+
+
+
+
+
+
+
+
macosx
@@ -168,6 +233,67 @@
-Dorg.eclipse.swt.browser.DefaultType=mozilla
+
+
+
+ ui-test-plugin
+
+
+ ui-test-plugin.properties
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-surefire-plugin
+
+ true
+ true
+
+
+
+
+
+
+
+
+ swtbot-test-plugin
+
+
+ swtbot-test-plugin.properties
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-surefire-plugin
+
+ true
+ false
+
+ ${SWT_GTK3}
+ 0
+
+
+
+
+
+
+
+
+
+ skip-sonar
+
+
+ sonar.skip.properties
+
+
+
+ true
+
+
@@ -201,7 +327,7 @@
- 3.0
+ ${required-maven-version}
1.8
@@ -250,7 +376,7 @@
org.eclipse.tracecompass
org.eclipse.tracecompass.target
${target-platform}
- 2.0.0
+ 2.1.0-SNAPSHOT
@@ -295,38 +421,6 @@
-
- org.jacoco
- jacoco-maven-plugin
- 0.7.4.201502262128
-
-
- pre-test
-
- prepare-agent
-
-
-
- ${sonar.jacoco.reportPath}
-
- org.eclipse.tracecompass.*
-
- true
-
-
-
- post-test
- post-integration-test
-
- report
-
-
- ${sonar.jacoco.reportPath}
-
-
-
-
-
org.eclipse.tycho.extras
tycho-pack200b-plugin
@@ -399,6 +493,9 @@
org.eclipse.tycho
tycho-p2-repository-plugin
${tycho-version}
+
+ true
+
@@ -417,7 +514,7 @@
org.eclipse.platform.ide
- ${tycho.testArgLine} ${base.ui.test.vmargs} -Xms512m -Xmx1024m
+ ${testArgLine} ${base.ui.test.vmargs} -Xms512m -Xmx1024m
@@ -448,7 +545,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 2.7
+ 3.0.1
UTF-8
@@ -460,16 +557,28 @@
1.8
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.10
+
+
+
+ org.eclipse.rcptt
+ rcptt-maven-plugin
+ ${rcptt-version}
+
+
org.apache.maven.plugins
maven-site-plugin
- 3.4
+ 3.5.1
org.apache.maven.plugins
maven-clean-plugin
- 2.6.1
+ 3.0.0
@@ -487,13 +596,13 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 2.8
+ 2.9
org.apache.maven.plugins
maven-javadoc-plugin
- 2.10.1
+ 2.10.4
org.eclipse.tracecompass.internal.*:*.test*
@@ -502,13 +611,13 @@
org.jboss.tools.tycho-plugins
repository-utils
- 0.23.2
+ 0.23.3
org.codehaus.mojo
sonar-maven-plugin
- 2.6
+ 3.0.2