From f03f21114078d49937b49c720974c1196639cac5 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 24 May 2022 17:59:52 +0200 Subject: [PATCH 1/8] #23392 implementing the "Clone Project" facility. Moved to 1.4.0-SNAPSHOT --- .classpath | 4 ++-- .settings/org.eclipse.jdt.core.prefs | 2 +- .../org.eclipse.wst.common.project.facet.core.xml | 2 +- CHANGELOG.md | 6 ++++++ pom.xml | 13 +++++++++++-- .../shared/config/ACTION_ON_ITEM.java | 1 + 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.classpath b/.classpath index 3f8d197..41e8506 100644 --- a/.classpath +++ b/.classpath @@ -30,9 +30,9 @@ - + - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 43c8195..d9c67f2 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 1b22d70..4f92af5 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/CHANGELOG.md b/CHANGELOG.md index 180c73a..3150671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v1.4.0-SNAPSHOT] - 2022-05-25 + +#### Enhancements + +- [#23392] Implemented the "Clone Project" facility + ## [v1.3.0] - 2021-12-03 #### Enhancements diff --git a/pom.xml b/pom.xml index c3ea668..79054bb 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.application geoportal-data-common - 1.3.0 + 1.4.0-SNAPSHOT GeoPortal Data Common is common library used by GUI components developed for GeoNA @@ -65,10 +65,17 @@ provided + + + org.gcube.application + geoportal-common + [1.0.0,1.0.8-SNAPSHOT) + + org.gcube.application geoportal-client - [1.0.0, 2.0.0-SNAPSHOT) + [1.0.0, 1.0.7-SNAPSHOT) compile @@ -77,6 +84,8 @@ + + org.gcube.portlets.user diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/config/ACTION_ON_ITEM.java b/src/main/java/org/gcube/application/geoportalcommon/shared/config/ACTION_ON_ITEM.java index 7d4562d..f4d82b6 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/config/ACTION_ON_ITEM.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/config/ACTION_ON_ITEM.java @@ -14,6 +14,7 @@ public enum ACTION_ON_ITEM { SHOW_METADATA("Show Metadata"), VIEW_REPORT("View the Report"), EDIT_PROJECT("Edit the Project"), + CLONE_PROJECT("Clone the Project"), DELETE_PROJECT("Delete the Project"); String label; From 91edd1ad94e3777cac457b7702336216874dd88a Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 26 May 2022 16:00:12 +0200 Subject: [PATCH 2/8] geoportal-client range [1.0.0, 1.0.8-SNAPSHOT) --- .classpath | 4 ++-- .settings/org.eclipse.jdt.core.prefs | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.classpath b/.classpath index 41e8506..3f8d197 100644 --- a/.classpath +++ b/.classpath @@ -30,9 +30,9 @@ - + - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index d9c67f2..43c8195 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled diff --git a/pom.xml b/pom.xml index 79054bb..26a8488 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ org.gcube.application geoportal-client - [1.0.0, 1.0.7-SNAPSHOT) + [1.0.0, 1.0.8-SNAPSHOT) compile From 44eb0bbdbf1d5bd764d8eb5ce4ecd43f2fea4a03 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 27 May 2022 17:37:38 +0200 Subject: [PATCH 3/8] Updated geoportal-common range to [1.0.0,1.0.9-SNAPSHOT) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26a8488..1a0e60a 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ org.gcube.application geoportal-common - [1.0.0,1.0.8-SNAPSHOT) + [1.0.0,1.0.9-SNAPSHOT) From 6e84b5ab68a93ffc77424b2d5921791fa80af717 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 1 Jun 2022 12:19:21 +0200 Subject: [PATCH 4/8] geoportal-client range [1.0.0, 1.0.7] --- pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 1a0e60a..96216e0 100644 --- a/pom.xml +++ b/pom.xml @@ -66,16 +66,10 @@ - - org.gcube.application - geoportal-common - [1.0.0,1.0.9-SNAPSHOT) - - org.gcube.application geoportal-client - [1.0.0, 1.0.8-SNAPSHOT) + [1.0.0, 1.0.7] compile From 092d7a089ec51166927677105afe114f90bda877 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 1 Jun 2022 17:44:29 +0200 Subject: [PATCH 5/8] #23457 Added action "Publish/UnPublish" Project --- CHANGELOG.md | 1 + .../geoportalcommon/shared/config/ACTION_ON_ITEM.java | 1 + src/test/java/org/gcube/application/TestGNACommon.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3150671..063f2ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm #### Enhancements - [#23392] Implemented the "Clone Project" facility +- [#23457] Implemented the "Publish/UnPublish Project" facility ## [v1.3.0] - 2021-12-03 diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/config/ACTION_ON_ITEM.java b/src/main/java/org/gcube/application/geoportalcommon/shared/config/ACTION_ON_ITEM.java index f4d82b6..f35b446 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/config/ACTION_ON_ITEM.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/config/ACTION_ON_ITEM.java @@ -15,6 +15,7 @@ public enum ACTION_ON_ITEM { VIEW_REPORT("View the Report"), EDIT_PROJECT("Edit the Project"), CLONE_PROJECT("Clone the Project"), + PUBLISH_UNPUBLISH_PROJECT("Publish/UnPublish the Project"), DELETE_PROJECT("Delete the Project"); String label; diff --git a/src/test/java/org/gcube/application/TestGNACommon.java b/src/test/java/org/gcube/application/TestGNACommon.java index 9664dff..0302b0e 100644 --- a/src/test/java/org/gcube/application/TestGNACommon.java +++ b/src/test/java/org/gcube/application/TestGNACommon.java @@ -92,7 +92,7 @@ public class TestGNACommon { } - // @Test + //@Test public void readGNDataEntryConfigsFromIS() throws Exception { Thread thread = new Thread() { From 882b58c19d54f0fed2d417acabaeee6e139290ef Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 8 Jun 2022 11:38:02 +0200 Subject: [PATCH 6/8] Removed -SNAPSHOT to be released --- CHANGELOG.md | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 063f2ab..0ae3152 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v1.4.0-SNAPSHOT] - 2022-05-25 +## [v1.4.0] - 2022-06-08 #### Enhancements diff --git a/pom.xml b/pom.xml index 96216e0..b8b051b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.application geoportal-data-common - 1.4.0-SNAPSHOT + 1.4.0 GeoPortal Data Common is common library used by GUI components developed for GeoNA From b08b9a691550526c6d0da1d893a3342b41117d76 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 26 Jul 2022 17:53:32 +0200 Subject: [PATCH 7/8] #23704 New maven version range required for (the old) geoportal-client --- CHANGELOG.md | 6 ++++++ pom.xml | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ae3152..04a4975 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v1.4.1-SNAPSHOT] - 2022-07-26 + +#### New + +- [#23704] New maven version range required for (the old) geoportal-client +- Moved to gcube-bom.2.0.2 ## [v1.4.0] - 2022-06-08 diff --git a/pom.xml b/pom.xml index b8b051b..23e03a1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.application geoportal-data-common - 1.4.0 + 1.4.1-SNAPSHOT GeoPortal Data Common is common library used by GUI components developed for GeoNA @@ -41,7 +41,7 @@ org.gcube.distribution gcube-bom - 2.0.1 + 2.0.2 pom import @@ -69,7 +69,7 @@ org.gcube.application geoportal-client - [1.0.0, 1.0.7] + [1.0.0, 1.1.0-SNAPSHOT) compile @@ -78,7 +78,7 @@ - + From ff7387299e3bf10d7e5307e269d9d671873f95cf Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 27 Jul 2022 12:13:47 +0200 Subject: [PATCH 8/8] Remove -SNAPSHOT to be released --- CHANGELOG.md | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04a4975..858dda6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v1.4.1-SNAPSHOT] - 2022-07-26 +## [v1.4.1] - 2022-07-27 #### New diff --git a/pom.xml b/pom.xml index 23e03a1..757b1a3 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.application geoportal-data-common - 1.4.1-SNAPSHOT + 1.4.1 GeoPortal Data Common is common library used by GUI components developed for GeoNA