diff --git a/checkstyle.xml b/checkstyle.xml index aced76b08..7a722e45b 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -1,13 +1,15 @@ - - - - + + - + + + + + @@ -63,9 +65,6 @@ - - - diff --git a/classlib/pom.xml b/classlib/pom.xml index f8028f7c2..b806a0149 100644 --- a/classlib/pom.xml +++ b/classlib/pom.xml @@ -88,17 +88,14 @@ com.google.code.gson gson - 2.2.4 com.jcraft jzlib - 1.1.3 joda-time joda-time - 2.7 @@ -107,7 +104,6 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 generate-tz-cache diff --git a/core/pom.xml b/core/pom.xml index dea4b9392..7d05fa4e1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${maven-javadoc-plugin.version} protected diff --git a/html4j/pom.xml b/html4j/pom.xml index f5f9dde30..3d40fe733 100644 --- a/html4j/pom.xml +++ b/html4j/pom.xml @@ -82,7 +82,6 @@ com.carrotsearch hppc - 0.7.3 true @@ -113,12 +112,11 @@ org.apache.maven.plugins maven-surefire-plugin - 2.16 org.apache.maven.surefire surefire-junit47 - 2.13 + ${maven-surefire-plugin.version} diff --git a/interop/core/pom.xml b/interop/core/pom.xml index 65b4c0d11..7e5a5b8d0 100644 --- a/interop/core/pom.xml +++ b/interop/core/pom.xml @@ -24,7 +24,7 @@ org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-interop diff --git a/jso/apis/pom.xml b/jso/apis/pom.xml index f042dabdd..e140a3eda 100644 --- a/jso/apis/pom.xml +++ b/jso/apis/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-jso-apis diff --git a/jso/core/pom.xml b/jso/core/pom.xml index f407d8dcd..c37ca5504 100644 --- a/jso/core/pom.xml +++ b/jso/core/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-jso diff --git a/jso/impl/pom.xml b/jso/impl/pom.xml index c8ba6fb92..bfa796b69 100644 --- a/jso/impl/pom.xml +++ b/jso/impl/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-jso-impl diff --git a/metaprogramming/api/pom.xml b/metaprogramming/api/pom.xml index 68389bc3a..24da61afe 100644 --- a/metaprogramming/api/pom.xml +++ b/metaprogramming/api/pom.xml @@ -24,7 +24,7 @@ org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-metaprogramming-api diff --git a/pom.xml b/pom.xml index a3278be96..cfc3f7475 100644 --- a/pom.xml +++ b/pom.xml @@ -65,19 +65,46 @@ UTF-8 https://oss.sonatype.org/content/repositories/snapshots/ + 1.5 - 9.4.38.v20210224 1.7.30 - 2.12.2 - 2018.2.8 9.1 + 1.8 11 + 1.7.11 - 3.8.0 + 7.1.0 4.13.2 + 1.4 + 2.8.0 + + 1.1.3 + 2.7 + 0.7.3 + + 9.4.38.v20210224 + 1.0 + 2.12.2 + 2.8.6 + + 2018.2.8 + + 3.3.3 + 3.3 + + 3.8.0 + 3.1.2 + 3.0.0-M5 + 3.2.1 + 3.2.0 + 3.2.0 + 3.2.4 + 1.6 + 3.0.0 + 3.4.3 false 1 @@ -136,7 +163,7 @@ commons-io commons-io - 2.4 + ${commons-io.version} org.ow2.asm @@ -151,27 +178,27 @@ org.apache.maven maven-plugin-api - 3.3.3 + ${maven-plugin-api.version} org.apache.maven.plugin-tools maven-plugin-annotations - 3.3 + ${maven-plugin-annotations.version} org.apache.maven maven-core - 3.3.3 + ${maven-plugin-api.version} org.apache.maven maven-artifact - 3.3.3 + ${maven-plugin-api.version} javax.websocket javax.websocket-api - 1.0 + ${javax-websocket.version} org.eclipse.jetty @@ -223,6 +250,26 @@ commons-cli ${commons-cli.version} + + com.google.code.gson + gson + ${gson.version} + + + com.jcraft + jzlib + ${jzlib.version} + + + joda-time + joda-time + ${joda-time.version} + + + com.carrotsearch + hppc + ${hppc.version} + @@ -231,7 +278,7 @@ org.apache.maven.wagon wagon-ftp - 3.4.3 + ${wagon-ftp.version} @@ -248,7 +295,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + ${maven-javadoc-plugin.version} build-javadoc @@ -270,7 +317,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + ${maven-source-plugin.version} attach-sources @@ -284,12 +331,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + ${maven-surefire-plugin.version} org.apache.maven.plugins maven-checkstyle-plugin - 2.16 + ${maven-checkstyle-plugin.version} validate @@ -313,42 +360,23 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 + ${maven-jar-plugin.version} org.apache.maven.plugins maven-shade-plugin - 3.1.1 + ${maven-shade-plugin.version} + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} - - htmlUnit - - true - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - htmlunit - - - - - - - - with-samples @@ -397,7 +425,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.4 + ${maven-gpg-plugin.version} sign-artifacts diff --git a/tests/pom.xml b/tests/pom.xml index 93f1d8d11..73b180091 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -73,7 +73,6 @@ com.carrotsearch hppc - 0.7.3 test @@ -117,12 +116,11 @@ org.apache.maven.plugins maven-surefire-plugin - 2.16 org.apache.maven.surefire surefire-junit47 - 2.16 + ${maven-surefire-plugin.version} diff --git a/tools/c-incremental/pom.xml b/tools/c-incremental/pom.xml index e5b2374da..986002ddb 100644 --- a/tools/c-incremental/pom.xml +++ b/tools/c-incremental/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-c-incremental @@ -47,7 +47,6 @@ com.carrotsearch hppc - 0.7.3 true diff --git a/tools/chrome-rdp/pom.xml b/tools/chrome-rdp/pom.xml index c466677fa..ceb25de37 100644 --- a/tools/chrome-rdp/pom.xml +++ b/tools/chrome-rdp/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-chrome-rdp diff --git a/tools/classlib-comparison-gen/pom.xml b/tools/classlib-comparison-gen/pom.xml index 748bc844c..d7eaa870d 100644 --- a/tools/classlib-comparison-gen/pom.xml +++ b/tools/classlib-comparison-gen/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-classlib-comparison-gen diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml index d1a51af7a..7a2f556bd 100644 --- a/tools/cli/pom.xml +++ b/tools/cli/pom.xml @@ -91,7 +91,6 @@ com.carrotsearch hppc - 0.7.3 true diff --git a/tools/core/pom.xml b/tools/core/pom.xml index cefbf1bc1..d85bc5819 100644 --- a/tools/core/pom.xml +++ b/tools/core/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-tooling diff --git a/tools/devserver/pom.xml b/tools/devserver/pom.xml index 1cfadf889..67d1182b4 100644 --- a/tools/devserver/pom.xml +++ b/tools/devserver/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-devserver diff --git a/tools/idea/idea-artifacts/pom.xml b/tools/idea/idea-artifacts/pom.xml index a09b3991d..592857f7f 100644 --- a/tools/idea/idea-artifacts/pom.xml +++ b/tools/idea/idea-artifacts/pom.xml @@ -42,7 +42,6 @@ org.codehaus.mojo exec-maven-plugin - 1.3.2 copy-dependencies diff --git a/tools/maven/pom.xml b/tools/maven/pom.xml index 52be36183..161fcb831 100644 --- a/tools/maven/pom.xml +++ b/tools/maven/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm 0.7.0-SNAPSHOT - ../.. + ../../pom.xml teavm-maven