diff --git a/infrastructures/openshift/pom.xml b/infrastructures/openshift/pom.xml index a555da19cd..352fac689d 100644 --- a/infrastructures/openshift/pom.xml +++ b/infrastructures/openshift/pom.xml @@ -108,10 +108,6 @@ org.eclipse.che.core che-core-commons-annotations - - org.eclipse.che.core - che-core-commons-inject - org.eclipse.che.core che-core-commons-lang @@ -153,6 +149,11 @@ jakarta.servlet-api provided + + org.eclipse.che.core + che-core-commons-inject + provided + io.netty netty-handler diff --git a/multiuser/permission/che-multiuser-permission-devfile/pom.xml b/multiuser/permission/che-multiuser-permission-devfile/pom.xml index f14fdf541a..94323afa89 100644 --- a/multiuser/permission/che-multiuser-permission-devfile/pom.xml +++ b/multiuser/permission/che-multiuser-permission-devfile/pom.xml @@ -32,39 +32,21 @@ org.eclipse.che.core - che-core-api-account + che-core-commons-test - org.eclipse.che.core - che-core-api-core + com.google.inject.extensions + guice-persist + provided org.eclipse.che.core che-core-api-devfile + provided org.eclipse.che.core - che-core-api-devfile-shared - - - org.eclipse.che.core - che-core-api-user - - - org.eclipse.che.core - che-core-api-workspace - - - org.eclipse.che.core - che-core-commons-lang - - - org.eclipse.che.core - che-core-commons-test - - - com.google.inject.extensions - guice-persist + che-core-api-model provided @@ -107,11 +89,36 @@ rest-assured test + + org.eclipse.che.core + che-core-api-account + test + + + org.eclipse.che.core + che-core-api-core + test + + + org.eclipse.che.core + che-core-api-devfile-shared + test + org.eclipse.che.core che-core-api-dto test + + org.eclipse.che.core + che-core-api-user + test + + + org.eclipse.che.core + che-core-api-workspace + test + org.eclipse.che.core che-core-commons-inject @@ -122,6 +129,11 @@ che-core-commons-json test + + org.eclipse.che.core + che-core-commons-lang + test + org.eclipse.che.core che-core-sql-schema diff --git a/multiuser/permission/che-multiuser-permission-system/pom.xml b/multiuser/permission/che-multiuser-permission-system/pom.xml index 533ff6ca2e..25b6a245eb 100644 --- a/multiuser/permission/che-multiuser-permission-system/pom.xml +++ b/multiuser/permission/che-multiuser-permission-system/pom.xml @@ -73,6 +73,11 @@ rest-assured test + + org.eclipse.che.core + che-core-api-system-shared + test + org.everrest everrest-assured diff --git a/multiuser/permission/che-multiuser-permission-workspace/pom.xml b/multiuser/permission/che-multiuser-permission-workspace/pom.xml index 98a364696d..1947f83b76 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/pom.xml +++ b/multiuser/permission/che-multiuser-permission-workspace/pom.xml @@ -58,6 +58,11 @@ guice-persist provided + + org.eclipse.che.core + che-core-api-model + provided + org.eclipse.che.multiuser che-multiuser-api-permission diff --git a/pom.xml b/pom.xml index 9a25ce1024..143f5a7f6f 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 3.0.0 3.3.2 3.14.1 - 3.1.2 + 3.9.0 3.0.0 3.0.0 0.47.0 diff --git a/wsmaster/che-core-api-auth-github/pom.xml b/wsmaster/che-core-api-auth-github/pom.xml index 29d9629464..d59b11f912 100644 --- a/wsmaster/che-core-api-auth-github/pom.xml +++ b/wsmaster/che-core-api-auth-github/pom.xml @@ -23,10 +23,6 @@ jar Che Core :: API :: Authentication Github - - com.google.guava - guava - com.google.inject guice @@ -52,6 +48,11 @@ wiremock-jre8-standalone test + + com.google.guava + guava + test + org.testng testng diff --git a/wsmaster/che-core-api-auth-gitlab/pom.xml b/wsmaster/che-core-api-auth-gitlab/pom.xml index 99e6dcb3a3..5570b55256 100644 --- a/wsmaster/che-core-api-auth-gitlab/pom.xml +++ b/wsmaster/che-core-api-auth-gitlab/pom.xml @@ -23,22 +23,10 @@ jar Che Core :: API :: Authentication GitLab - - com.google.guava - guava - - - com.google.http-client - google-http-client - com.google.inject guice - - com.google.oauth-client - google-oauth-client - jakarta.inject jakarta.inject-api @@ -53,11 +41,27 @@ org.eclipse.che.core - che-core-api-auth-shared + che-core-commons-annotations + + + com.google.guava + guava + test + + + com.google.http-client + google-http-client + test + + + com.google.oauth-client + google-oauth-client + test org.eclipse.che.core - che-core-commons-annotations + che-core-api-auth-shared + test org.testng diff --git a/wsmaster/che-core-api-devfile/pom.xml b/wsmaster/che-core-api-devfile/pom.xml index 95b557f5d3..84d119eeac 100644 --- a/wsmaster/che-core-api-devfile/pom.xml +++ b/wsmaster/che-core-api-devfile/pom.xml @@ -31,10 +31,6 @@ com.google.guava guava - - com.google.inject - guice - jakarta.inject jakarta.inject-api @@ -47,10 +43,6 @@ org.eclipse.che.core che-core-api-account - - org.eclipse.che.core - che-core-api-core - org.eclipse.che.core che-core-api-devfile-shared @@ -63,10 +55,6 @@ org.eclipse.che.core che-core-api-model - - org.eclipse.che.core - che-core-api-user - org.eclipse.che.core che-core-api-workspace @@ -77,7 +65,8 @@ org.eclipse.che.core - che-core-commons-lang + che-core-api-core + provided org.eclipse.persistence @@ -89,6 +78,11 @@ logback-classic test + + com.google.inject + guice + test + com.h2database h2 @@ -104,11 +98,21 @@ rest-assured test + + org.eclipse.che.core + che-core-api-user + test + org.eclipse.che.core che-core-commons-json test + + org.eclipse.che.core + che-core-commons-lang + test + org.eclipse.che.core che-core-commons-test diff --git a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml index d6af40a214..d6c5f2f5ac 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml +++ b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml @@ -86,10 +86,6 @@ org.eclipse.che.core che-core-api-factory-shared - - org.eclipse.che.core - che-core-api-model - org.eclipse.che.core che-core-api-workspace @@ -110,6 +106,11 @@ org.slf4j slf4j-api + + org.eclipse.che.core + che-core-api-model + provided + ch.qos.logback logback-classic diff --git a/wsmaster/che-core-api-factory-bitbucket/pom.xml b/wsmaster/che-core-api-factory-bitbucket/pom.xml index 4b8471f232..dc6a3cd686 100644 --- a/wsmaster/che-core-api-factory-bitbucket/pom.xml +++ b/wsmaster/che-core-api-factory-bitbucket/pom.xml @@ -74,10 +74,6 @@ org.eclipse.che.core che-core-api-factory-shared - - org.eclipse.che.core - che-core-api-model - org.eclipse.che.core che-core-api-workspace @@ -98,6 +94,11 @@ org.slf4j slf4j-api + + org.eclipse.che.core + che-core-api-model + provided + ch.qos.logback logback-classic diff --git a/wsmaster/che-core-api-factory-git-ssh/pom.xml b/wsmaster/che-core-api-factory-git-ssh/pom.xml index e6863af79d..d7a8544f0c 100644 --- a/wsmaster/che-core-api-factory-git-ssh/pom.xml +++ b/wsmaster/che-core-api-factory-git-ssh/pom.xml @@ -26,10 +26,6 @@ true - - com.google.guava - guava - jakarta.inject jakarta.inject-api @@ -68,6 +64,11 @@ wiremock-jre8-standalone test + + com.google.guava + guava + test + jakarta.servlet jakarta.servlet-api diff --git a/wsmaster/che-core-api-factory-github/pom.xml b/wsmaster/che-core-api-factory-github/pom.xml index 783e7e2aa1..1fb667a673 100644 --- a/wsmaster/che-core-api-factory-github/pom.xml +++ b/wsmaster/che-core-api-factory-github/pom.xml @@ -26,10 +26,6 @@ true - - com.google.guava - guava - com.google.inject guice @@ -42,18 +38,6 @@ org.eclipse.che.core che-core-api-auth - - org.eclipse.che.core - che-core-api-auth-shared - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - org.eclipse.che.core che-core-api-factory @@ -64,23 +48,21 @@ org.eclipse.che.core - che-core-api-factory-shared - - - org.eclipse.che.core - che-core-api-model + che-core-api-workspace org.eclipse.che.core - che-core-api-workspace + che-core-commons-annotations org.eclipse.che.core - che-core-commons-annotations + che-core-api-core + provided org.eclipse.che.core che-core-commons-lang + provided ch.qos.logback @@ -92,6 +74,11 @@ wiremock-jre8-standalone test + + com.google.guava + guava + test + jakarta.servlet jakarta.servlet-api @@ -102,6 +89,26 @@ jakarta.ws.rs-api test + + org.eclipse.che.core + che-core-api-auth-shared + test + + + org.eclipse.che.core + che-core-api-dto + test + + + org.eclipse.che.core + che-core-api-factory-shared + test + + + org.eclipse.che.core + che-core-api-model + test + org.eclipse.che.core che-core-commons-json diff --git a/wsmaster/che-core-api-factory-gitlab/pom.xml b/wsmaster/che-core-api-factory-gitlab/pom.xml index 7b3b74a2e9..9fac97701a 100644 --- a/wsmaster/che-core-api-factory-gitlab/pom.xml +++ b/wsmaster/che-core-api-factory-gitlab/pom.xml @@ -23,10 +23,6 @@ jar Che Core :: API :: Factory Resolver Gitlab - - com.google.guava - guava - com.google.inject guice @@ -39,18 +35,6 @@ org.eclipse.che.core che-core-api-auth - - org.eclipse.che.core - che-core-api-auth-shared - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - org.eclipse.che.core che-core-api-factory @@ -61,27 +45,25 @@ org.eclipse.che.core - che-core-api-factory-shared + che-core-api-workspace org.eclipse.che.core - che-core-api-model + che-core-commons-annotations - org.eclipse.che.core - che-core-api-workspace + jakarta.servlet + jakarta.servlet-api + provided org.eclipse.che.core - che-core-commons-annotations + che-core-api-core + provided org.eclipse.che.core che-core-commons-lang - - - jakarta.servlet - jakarta.servlet-api provided @@ -94,11 +76,36 @@ wiremock-jre8-standalone test + + com.google.guava + guava + test + jakarta.ws.rs jakarta.ws.rs-api test + + org.eclipse.che.core + che-core-api-auth-shared + test + + + org.eclipse.che.core + che-core-api-dto + test + + + org.eclipse.che.core + che-core-api-factory-shared + test + + + org.eclipse.che.core + che-core-api-model + test + org.eclipse.che.core che-core-commons-json