From c53db6d26f3c2cdbb8612cca765b56e5bbc6dacc Mon Sep 17 00:00:00 2001 From: Danny van Bruggen Date: Thu, 18 Jan 2018 20:52:24 +0100 Subject: [PATCH] Clean up poms --- javaparser-core-generators/pom.xml | 1 - javaparser-core/pom.xml | 5 - javaparser-metamodel-generator/pom.xml | 2 - javaparser-symbol-solver-core/pom.xml | 210 +++++++++--------- javaparser-symbol-solver-logic/pom.xml | 39 ++-- javaparser-symbol-solver-model/pom.xml | 8 - .../javaparser-symbol-solver-testing.iml | 8 +- javaparser-symbol-solver-testing/pom.xml | 53 ++--- javaparser-testing/pom.xml | 4 - pom.xml | 107 +++++++-- 10 files changed, 231 insertions(+), 206 deletions(-) diff --git a/javaparser-core-generators/pom.xml b/javaparser-core-generators/pom.xml index fe870ec240..e21f945ae5 100644 --- a/javaparser-core-generators/pom.xml +++ b/javaparser-core-generators/pom.xml @@ -26,7 +26,6 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 generate-javaparser-core diff --git a/javaparser-core/pom.xml b/javaparser-core/pom.xml index 70c38808b4..a12e0ac9f8 100644 --- a/javaparser-core/pom.xml +++ b/javaparser-core/pom.xml @@ -50,7 +50,6 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 @@ -72,7 +71,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M1 enforce-versions @@ -106,7 +104,6 @@ biz.aQute.bnd bnd-maven-plugin - ${bnd-maven-plugin.version} @@ -118,7 +115,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} @@ -143,7 +139,6 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 add-source diff --git a/javaparser-metamodel-generator/pom.xml b/javaparser-metamodel-generator/pom.xml index 24e64db0f0..d060ba05cd 100644 --- a/javaparser-metamodel-generator/pom.xml +++ b/javaparser-metamodel-generator/pom.xml @@ -23,7 +23,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 true @@ -40,7 +39,6 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 generate-javaparser-metamodel diff --git a/javaparser-symbol-solver-core/pom.xml b/javaparser-symbol-solver-core/pom.xml index a5c6a33bc1..08f86b1e94 100644 --- a/javaparser-symbol-solver-core/pom.xml +++ b/javaparser-symbol-solver-core/pom.xml @@ -1,16 +1,17 @@ - - - javaparser-parent - com.github.javaparser - 3.5.11-SNAPSHOT - - 4.0.0 + + + javaparser-parent + com.github.javaparser + 3.5.11-SNAPSHOT + + 4.0.0 + + javaparser-symbol-solver-core + jar + A Symbol Solver for Java, built on top of JavaParser (core) - javaparser-symbol-solver-core - jar - A Symbol Solver for Java, built on top of JavaParser (core) - GNU Lesser General Public License @@ -30,103 +31,94 @@ ${maven.build.timestamp} - - - com.github.javaparser - javaparser-symbol-solver-logic - ${project.version} - compile - - - org.javassist - javassist - 3.22.0-GA - compile - - - com.github.javaparser - javaparser-symbol-solver-model - ${project.version} - compile - - - com.google.guava - guava - 23.4-jre - compile - - + + + com.github.javaparser + javaparser-symbol-solver-logic + ${project.version} + + + org.javassist + javassist + + + com.github.javaparser + javaparser-symbol-solver-model + ${project.version} + + + com.google.guava + guava + + - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.16 - - - - org.codehaus.mojo.signature - java18 - 1.0 - - - - - animal-sniffer - verify - - check - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M1 - - - enforce-versions - verify - - enforce - - - - - - ${java.version} - - - - ${java.version} - - - - - - - - org.codehaus.mojo - extra-enforcer-rules - 1.0-beta-6 - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - - com.github.javaparser.symbolsolver.core - - - - - - + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + + org.codehaus.mojo.signature + java18 + 1.0 + + + + + animal-sniffer + verify + + check + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + verify + + enforce + + + + + + ${java.version} + + + + ${java.version} + + + + + + + + org.codehaus.mojo + extra-enforcer-rules + 1.0-beta-6 + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + com.github.javaparser.symbolsolver.core + + + + + + diff --git a/javaparser-symbol-solver-logic/pom.xml b/javaparser-symbol-solver-logic/pom.xml index 43cac15d93..549a1ab533 100644 --- a/javaparser-symbol-solver-logic/pom.xml +++ b/javaparser-symbol-solver-logic/pom.xml @@ -1,5 +1,6 @@ - + javaparser-parent com.github.javaparser @@ -30,26 +31,21 @@ ${maven.build.timestamp} - - - org.javassist - javassist - 3.22.0-GA - compile - - - com.github.javaparser - javaparser-symbol-solver-model - ${project.version} - compile - - - com.google.guava - guava - 23.4-jre - compile - - + + + org.javassist + javassist + + + com.github.javaparser + javaparser-symbol-solver-model + ${project.version} + + + com.google.guava + guava + + @@ -112,7 +108,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/javaparser-symbol-solver-model/pom.xml b/javaparser-symbol-solver-model/pom.xml index 8afe4ab0f7..0e371795f1 100644 --- a/javaparser-symbol-solver-model/pom.xml +++ b/javaparser-symbol-solver-model/pom.xml @@ -35,19 +35,14 @@ com.github.javaparser javaparser-core ${project.version} - compile org.javassist javassist - 3.22.0-GA - compile com.google.guava guava - 23.4-jre - compile @@ -56,7 +51,6 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 @@ -78,7 +72,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M1 enforce-versions @@ -112,7 +105,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/javaparser-symbol-solver-testing/javaparser-symbol-solver-testing.iml b/javaparser-symbol-solver-testing/javaparser-symbol-solver-testing.iml index 2c6f4df6fb..bf53f2c01f 100644 --- a/javaparser-symbol-solver-testing/javaparser-symbol-solver-testing.iml +++ b/javaparser-symbol-solver-testing/javaparser-symbol-solver-testing.iml @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/javaparser-symbol-solver-testing/pom.xml b/javaparser-symbol-solver-testing/pom.xml index 437dd38d52..fb3bafda5f 100644 --- a/javaparser-symbol-solver-testing/pom.xml +++ b/javaparser-symbol-solver-testing/pom.xml @@ -1,5 +1,6 @@ - + javaparser-parent com.github.javaparser @@ -38,7 +39,6 @@ com.github.javaparser.SlowTest methods - 4 @@ -54,7 +54,6 @@ maven-surefire-plugin methods - 4 @@ -86,7 +85,6 @@ maven-resources-plugin - ${maven-resources-plugin.version} copy-resources @@ -110,7 +108,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 true @@ -119,35 +116,29 @@ - - junit - junit - 4.12 - test - - - com.github.javaparser - javaparser-symbol-solver-logic - ${project.version} - compile - + + junit + junit + + + com.github.javaparser + javaparser-symbol-solver-logic + ${project.version} + org.mockito mockito-core - 2.13.0 - - com.github.javaparser - javaparser-symbol-solver-model - ${project.version} - compile - - - com.github.javaparser - javaparser-symbol-solver-core - ${project.version} - compile - + + com.github.javaparser + javaparser-symbol-solver-model + ${project.version} + + + com.github.javaparser + javaparser-symbol-solver-core + ${project.version} + - + diff --git a/javaparser-testing/pom.xml b/javaparser-testing/pom.xml index 162b921e7d..36e20d5129 100644 --- a/javaparser-testing/pom.xml +++ b/javaparser-testing/pom.xml @@ -46,7 +46,6 @@ maven-resources-plugin - ${maven-resources-plugin.version} copy-resources @@ -70,7 +69,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 true @@ -88,8 +86,6 @@ org.junit.jupiter junit-jupiter-api - 5.0.0 - test org.jbehave diff --git a/pom.xml b/pom.xml index 6e54575970..3203523340 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 javaparser-core @@ -128,17 +129,6 @@ 1.8 - 3.0.0 - 3.0.0 - 3.7.0 - 2.5.2 - 3.0.2 - 2.5.3 - 3.0.1 - 0.7.9 - 4.3.0 - 3.0.1 - 3.4.0 @@ -189,51 +179,128 @@ com.helger.maven ph-javacc-maven-plugin - ${javacc-maven-plugin.version} + 3.0.0 org.apache.maven.plugins maven-clean-plugin - ${maven-clean-plugin.version} + 3.0.0 org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + 3.7.0 org.apache.maven.plugins maven-install-plugin - ${maven-install-plugin.version} + 2.5.2 org.apache.maven.plugins maven-release-plugin - ${maven-release-plugin.version} + 2.5.3 org.apache.maven.plugins maven-source-plugin - ${maven-source-plugin.version} + 3.0.1 + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 org.eluder.coveralls coveralls-maven-plugin - ${maven-coveralls-plugin.version} + 4.3.0 org.jacoco jacoco-maven-plugin - ${maven-jacoco-plugin.version} + 0.7.9 org.apache.maven.plugins maven-javadoc-plugin + 3.0.0 + + + biz.aQute.bnd + bnd-maven-plugin + 3.4.0 + + + org.apache.maven.plugins + maven-enforcer-plugin 3.0.0-M1 + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.16 + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + org.codehaus.mojo + templating-maven-plugin + 1.0.0 + + + + + org.javassist + javassist + 3.22.0-GA + + + com.google.guava + guava + 23.4-jre + + + junit + junit + 4.12 + test + + + org.junit.jupiter + junit-jupiter-api + 5.0.0 + test + + + org.mockito + mockito-core + 2.13.0 + test + + + doclint-java8-disable