diff --git a/pom/pom.xml b/pom/pom.xml index b7f866d6184..0bf97dbc575 100644 --- a/pom/pom.xml +++ b/pom/pom.xml @@ -22,13 +22,14 @@ org.apache apache - 17 + 19 org.apache.felix felix-parent pom + Apache Felix 5-SNAPSHOT http://felix.apache.org/ @@ -36,18 +37,19 @@ Apache Felix is a community effort to implement the OSGi Framework and Service platform and other interesting OSGi-related technologies. - 3.0.5 + 3.5.0 source-release-zip-tar - 5 - org.codehaus.mojo.signature + 7 *.impl:*.internal: + UTF-8 + UTF-8 @@ -99,51 +101,18 @@ - - - - junit - junit - 4.12 - - - org.easymock - easymock - 3.4 - - - org.mockito - mockito-all - 1.10.19 - - - - - - - - junit - junit - test - - - org.easymock - easymock - test - - - org.mockito - mockito-all - test - - + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M1 + org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 org.apache.maven.plugins @@ -158,46 +127,25 @@ org.apache.rat apache-rat-plugin - 0.11 + 0.12 org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 org.codehaus.mojo animal-sniffer-maven-plugin - 1.14 - + 1.15 + - ${felix.java.signature.groupId} - ${felix.java.signature.artifactId} - ${felix.java.signature.version} + org.codehaus.mojo.signature + java1${felix.java.version} + 1.0 - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - - org.apache.ant - ant-apache-regexp - 1.7.1 - runtime - - - jakarta-regexp - jakarta-regexp - 1.4 - - - org.apache.maven.plugins maven-site-plugin @@ -213,54 +161,41 @@ org.apache.maven.plugins - maven-antrun-plugin + maven-enforcer-plugin + + enforce-property-values + + enforce + + + + + felix.java.version + [6-9] + The property "felix.java.version" may only have one of the following values: 6, 7, 8 or 9. + + + + - set-bundle-required-execution-environment + enforce-java - run + enforce - initialize - true - - - + + + + + Apache Felix must be compiled with Java 7 or higher + + 1.7.0 + + + 3.5.0 + + @@ -272,14 +207,6 @@ ${site.javadoc.exclude} - - org.apache.maven.plugins - maven-compiler-plugin - - 1.${felix.java.version} - 1.${felix.java.version} - - org.apache.rat apache-rat-plugin @@ -303,18 +230,6 @@ **/*.json - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - test - - check - - - org.apache.maven.plugins @@ -360,6 +275,58 @@ + + jdk8-or-lower + + + (,9) + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.${felix.java.version} + 1.${felix.java.version} + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + + check + + + + + + + + + jdk9-or-higher + + + [9,) + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + ${felix.java.version} + + + + + only-eclipse