diff --git a/.project b/.project index a30e836..2ec7193 100644 --- a/.project +++ b/.project @@ -3,6 +3,7 @@ smartgears-distribution + common-service diff --git a/Dockerfile b/Dockerfile index 263e720..f5e1c7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat:8.5.47-jdk8-openjdk +FROM tomcat:9.0.48-jdk8-openjdk-buster ARG nexuspath ARG filename ARG version @@ -6,7 +6,7 @@ FROM tomcat:8.5.47-jdk8-openjdk WORKDIR / RUN tar zxvf /smartgears-distro.tar.gz RUN export CATALINA_HOME=/usr/local/tomcat + RUN ln -s /usr/local/tomcat tomcat RUN mv smartgears-distribution-$version smartgears-distribution ENV GHN_HOME=./smartgears-distribution - RUN ./smartgears-distribution/install -s tomcat - + RUN ./smartgears-distribution/install -s tomcat \ No newline at end of file diff --git a/pom.xml b/pom.xml index 452ebbb..569d13b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -29,7 +30,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.0 + 3.0.0-SNAPSHOT pom import @@ -40,15 +41,10 @@ org.gcube.core common-smartgears - [4.0.0-SNAPSHOT, 5.0.0-SNAPSHOT) - - - org.gcube.core - common-smartgears-utils org.gcube.common - gxHTTP + gxHTTP org.gcube.core @@ -88,7 +84,7 @@ probe war - + + + org.gcube.core + smartgears-management + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + war + @@ -161,6 +164,7 @@ +