gCubeSystem
/
workspace
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

edit_facility_26115 #3

Merged
francesco.mangiacrapa merged 8 commits from edit_facility_26115 into master 2024-03-19 10:38:23 +01:00
Conversation 0 Commits 8 Files Changed 8 +69 -35
3 changed files with 69 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 01075df11f - Show all commits

5
.classpath
View File

@ -30,5 +30,10 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/workspace-6.29.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/workspace-6.29.1-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/workspace-6.29.1-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

60
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
@ -63,7 +67,11 @@
<wb-module deploy-name="workspace-6.29.1-SNAPSHOT"> <wb-module deploy-name="workspace-6.29.1-SNAPSHOT">
@ -127,7 +135,11 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -191,7 +203,11 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -255,7 +271,11 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
@ -286,10 +306,20 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="workspace-tree-widget-6.35.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree"> <dependent-module archiveName="workspace-tree-widget-6.35.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="ckan-metadata-publisher-widget-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -353,7 +383,11 @@
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/> <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
@ -417,7 +451,11 @@
<property name="context-root" value="workspace"/> <property name="context-root" value="workspace"/>
@ -481,7 +519,11 @@
</wb-module> </wb-module>

39
pom.xml
View File

@ -55,32 +55,11 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<!-- <profiles> <!-- <profiles> <profile> <id>workspace-release-profile</id> <activation>
PROD profile <property> <name>Release</name> </property> </activation> <properties> <gcube-portal-bom-version>3.7.0</gcube-portal-bom-version>
<profile> </properties> </profile> <profile> <id>workspace-snapshot-profile</id> <activation>
<id>workspace-release-profile</id> <property> <name>!Release</name> </property> </activation> <properties> <gcube-portal-bom-version>3.8.0-SNAPSHOT</gcube-portal-bom-version>
<activation> </properties> </profile> </profiles> -->
<property>
<name>Release</name>
</property>
</activation>
<properties>
<gcube-portal-bom-version>3.7.0</gcube-portal-bom-version>
</properties>
</profile>
DEV profile
<profile>
<id>workspace-snapshot-profile</id>
<activation>
<property>
<name>!Release</name>
</property>
</activation>
<properties>
<gcube-portal-bom-version>3.8.0-SNAPSHOT</gcube-portal-bom-version>
</properties>
</profile>
</profiles> -->
<dependencies> <dependencies>
@ -152,6 +131,14 @@
<dependency> <dependency>
<groupId>org.gcube.contentmanagement</groupId> <groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-wrapper</artifactId> <artifactId>storage-manager-wrapper</artifactId>
<!-- Resolving conflict (NoSuchMethodError stax2/ri/EmptyIterator) with version stax2-api:jar:4.1
see https://support.d4science.org/issues/26825#note-5 -->
<exclusions>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
</exclusion>
</exclusions>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>