From 032bdcc4af3aa0dcda4d784ec4ba20eff924cdd1 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 8 Dec 2015 14:35:03 -0500 Subject: [PATCH] Use maven-enforcer-plugin to enforce minimum versions tags are not inherited by children. We can use maven-enforcer-plugin to really check the Maven version. See http://stackoverflow.com/q/18055009/4227853 . It's not really clear if is really deprecated or not, but "mvn versions" complains if it is not present, so we can at least leave it in the top-level pom. While at it we can also configure it to check for the minimum Java version the project needs (1.8). Change-Id: I607c33e3fecf39d932ae7a44d58b85ce20336dc7 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/62280 Reviewed-by: Hudson CI Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- analysis/pom.xml | 4 ---- btf/pom.xml | 4 ---- common/pom.xml | 4 ---- ctf/pom.xml | 4 ---- doc/pom.xml | 4 ---- gdbtrace/pom.xml | 4 ---- lttng/pom.xml | 4 ---- pcap/pom.xml | 4 ---- pom.xml | 31 +++++++++++++++++++++++++++++-- rcp/pom.xml | 4 ---- releng/pom.xml | 4 ---- statesystem/pom.xml | 4 ---- tmf/pom.xml | 4 ---- 13 files changed, 29 insertions(+), 50 deletions(-) diff --git a/analysis/pom.xml b/analysis/pom.xml index eb4baf4406..e6249a2614 100644 --- a/analysis/pom.xml +++ b/analysis/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/btf/pom.xml b/btf/pom.xml index 566a755e6c..48b89557be 100644 --- a/btf/pom.xml +++ b/btf/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/common/pom.xml b/common/pom.xml index 3ca85d2659..745be737a6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/ctf/pom.xml b/ctf/pom.xml index 024a534617..ca5ac04ee7 100644 --- a/ctf/pom.xml +++ b/ctf/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/doc/pom.xml b/doc/pom.xml index 8957a7895f..2ac703bfbf 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/gdbtrace/pom.xml b/gdbtrace/pom.xml index e1a615dacf..96677d8b33 100644 --- a/gdbtrace/pom.xml +++ b/gdbtrace/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/lttng/pom.xml b/lttng/pom.xml index 7a6e3c32a7..12009cb670 100644 --- a/lttng/pom.xml +++ b/lttng/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/pcap/pom.xml b/pcap/pom.xml index 7e39f0258e..bf7fc560a7 100644 --- a/pcap/pom.xml +++ b/pcap/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/pom.xml b/pom.xml index 3b09babe01..af01e48ac4 100644 --- a/pom.xml +++ b/pom.xml @@ -176,8 +176,33 @@ tmf - - + + + + true + org.apache.maven.plugins + maven-enforcer-plugin + 1.4.1 + + + enforce-maven-version + + enforce + + + + + 3.0 + + + 1.8 + + + true + + + + org.eclipse.tycho target-platform-configuration @@ -325,6 +350,8 @@ tycho-compiler-plugin ${tycho-version} + 1.8 + 1.8 UTF-8 true diff --git a/rcp/pom.xml b/rcp/pom.xml index 806db115ab..864291c65d 100644 --- a/rcp/pom.xml +++ b/rcp/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/releng/pom.xml b/releng/pom.xml index d25824a7f4..d5c7eb92ab 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/statesystem/pom.xml b/statesystem/pom.xml index 860c3f00a2..1dfe11e2ab 100644 --- a/statesystem/pom.xml +++ b/statesystem/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass diff --git a/tmf/pom.xml b/tmf/pom.xml index ea4e8b2298..ffaaae7322 100644 --- a/tmf/pom.xml +++ b/tmf/pom.xml @@ -13,10 +13,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - 3.0 - - org.eclipse.tracecompass org.eclipse.tracecompass -- 2.34.1