diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
index 8d15b4132..9ee4ca32c 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -83,6 +83,7 @@
+
@@ -230,16 +231,6 @@
-
-
-
- org.javassist
- javassist
- 3.29.2-GA
- jar
-
-
-
diff --git a/pom.xml b/pom.xml
index 08ad71c6b..8e777f62d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
- 3.6.3
+ 3.9
UTF-8
UTF-8
@@ -50,8 +50,8 @@
17
17
- 2.7.3
- 2.7.3
+ 4.0.3
+ 4.0.3
true
scm:git:git://git.eclipse.org/gitroot/tracecompass.incubator/org.eclipse.tracecompass.incubator.git
1.4.2
@@ -119,21 +119,6 @@
sign-update-site
-
- org.eclipse.tycho.extras
- tycho-pack200a-plugin
- ${tycho-extras-version}
-
-
- pack200-normalize
-
- normalize
-
- package
-
-
-
-
org.eclipse.cbi.maven.plugins
eclipse-jarsigner-plugin
@@ -148,21 +133,6 @@
-
-
- org.eclipse.tycho.extras
- tycho-pack200b-plugin
- ${tycho-extras-version}
-
-
- pack200-pack
-
- pack
-
- package
-
-
-
@@ -401,7 +371,6 @@
target-platform-configuration
JavaSE-${jdk.version}
- true
win32
@@ -441,45 +410,22 @@
org.eclipse.tycho
tycho-source-plugin
${tycho-version}
-
-
- plugin-source
-
- plugin-source
-
-
-
-
-
-
- org.eclipse.tycho.extras
- tycho-source-feature-plugin
- ${tycho-extras-version}
false
- source-feature
- package
+ plugin-source
- source-feature
+ plugin-source
-
-
-
-
- org.eclipse.tycho.extras
- tycho-pack200b-plugin
- ${tycho-extras-version}
-
- pack200-pack
+ feature-source
+ package
- pack
+ feature-source
- package
@@ -596,6 +542,7 @@
org.apache.maven.plugins
maven-toolchains-plugin
+ 3.1.0
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp.branding.feature/pom.xml b/rcp/org.eclipse.tracecompass.incubator.rcp.branding.feature/pom.xml
index f0aa6f934..020dcab9f 100644
--- a/rcp/org.eclipse.tracecompass.incubator.rcp.branding.feature/pom.xml
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp.branding.feature/pom.xml
@@ -27,15 +27,18 @@
- org.eclipse.tycho.extras
- tycho-source-feature-plugin
+ org.eclipse.tycho
+ tycho-source-plugin
${tycho-version}
+
+ false
+
- source-feature
+ feature-source
package
- source-feature
+ feature-source
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml b/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
index 73fb194f9..3781983b8 100644
--- a/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
@@ -27,14 +27,18 @@
- org.eclipse.tycho.extras
- tycho-source-feature-plugin
+ org.eclipse.tycho
+ tycho-source-plugin
+ ${tycho-version}
+
+ false
+
- source-feature
+ feature-source
package
- source-feature
+ feature-source