From ca7678fc8d1b59eeb368bd64a40002ee2f68e2f1 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 18 May 2022 15:52:13 +0200 Subject: [PATCH] merged pom with https://code-repo.d4science.org/gCubeSystem/ckan-content-moderator-widget/src/branch/task_21363/pom.xml --- pom.xml | 145 +++++++++++++++++++++++++++++++++++--------- src/test/.gitignore | 1 + 2 files changed, 116 insertions(+), 30 deletions(-) create mode 100644 src/test/.gitignore diff --git a/pom.xml b/pom.xml index 88370fd..6003325 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.widgets ckan-content-moderator-widget jar - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT gCube Ckan Content Moderator Widget @@ -30,12 +30,11 @@ - 2.7.0 - + 2.9.0 distro UTF-8 UTF-8 - 1.7 + 1.8 1.8 @@ -44,28 +43,57 @@ org.gcube.distribution maven-portal-bom - 3.6.2-SNAPSHOT - pom - import - - - com.google.gwt - gwt - ${gwtVersion} + 3.6.3-SNAPSHOT pom import + + + com.google.gwt + gwt-user + + + com.google.gwt + gwt-servlet + + + com.google.gwt + gwt-dev + + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + xml-apis + xml-apis + 1.4.01 + provided + + com.google.gwt gwt-user ${gwtVersion} provided + + com.google.gwt + gwt-servlet + ${gwtVersion} + runtime + com.google.gwt gwt-dev @@ -77,22 +105,61 @@ gwt-bootstrap 2.3.2.0 + + + org.gcube.core + common-encryption + + + + + org.gcube.resources.discovery + ic-client + provided + + + org.gcube.core + common-scope-maps + compile + + org.gcube.datacatalogue catalogue-util-library [1.0.0-SNAPSHOT, 2.0.0) compile + + - org.slf4j - slf4j-log4j12 + org.gcube.common.portal + portal-manager provided + + + com.liferay.portal + portal-service + provided + + + + + org.gcube.dvos + usermanagement-core + provided + + org.slf4j slf4j-api - provided + + org.slf4j + slf4j-log4j12 + test + + junit junit @@ -102,8 +169,6 @@ - - src/main/java @@ -114,13 +179,11 @@ src/main/resources - **/*.* + **/* - - org.codehaus.mojo @@ -130,22 +193,18 @@ compile - test + - - - CkanContentModeratorWidget.html - - org.gcube.portlets.widgets.ckancontentmoderator.CkanContentModeratorWidget - - org.apache.maven.plugins maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + @@ -166,7 +225,33 @@ + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + + copy-profile + install + + copy-resources + + + target + + + ${distroDirectory} + true + + profile.xml + + + + + + + - + \ No newline at end of file diff --git a/src/test/.gitignore b/src/test/.gitignore new file mode 100644 index 0000000..cb6eb2c --- /dev/null +++ b/src/test/.gitignore @@ -0,0 +1 @@ +/resources/