Merge pull request #49 from riseclipse/develop

new release

Author: marcadetd

.github/workflows/Release-On-Maven-Central.yml

@@ -1,5 +1,5 @@
 # *************************************************************************
-# **  Copyright (c) 2022 CentraleSupélec & EDF.
+# **  Copyright (c) 2022-2025 CentraleSupélec & EDF.
 # **  All rights reserved. This program and the accompanying materials
 # **  are made available under the terms of the Eclipse Public License v2.0
 # **  which accompanies this distribution, and is available at
@@ -17,18 +17,18 @@
 # **      https://riseclipse.github.io
 # *************************************************************************
 
-name: Release on OSSRH and Maven Central
+name: Release on Maven Central
 
 on:
   workflow_dispatch: # Triggered manually for Release
 
 jobs:
-  call-release-on-ossrh-and-maven-central-workflow:
-    name: Release on OSSRH and Maven Central with Maven
+  call-release-on-maven-central-workflow:
+    name: Release on Maven Central with Maven
     uses: riseclipse/riseclipse-developer/.github/workflows/Shared-Release-On-Maven-Central.yml@master
     secrets:
       RISECLIPSE_PGP_KEY_PRIVATE:  ${{ secrets.RISECLIPSE_PGP_KEY_PRIVATE }}
       RISECLIPSE_PGP_KEY_PASSWORD: ${{ secrets.RISECLIPSE_PGP_KEY_PASSWORD }}
-      RISECLIPSE_OSSRH_USERNAME:   ${{ secrets.RISECLIPSE_OSSRH_USERNAME }}
-      RISECLIPSE_OSSRH_PASSWORD:   ${{ secrets.RISECLIPSE_OSSRH_PASSWORD }}
+      RISECLIPSE_CENTRAL_USERNAME: ${{ secrets.RISECLIPSE_CENTRAL_USERNAME }}
+      RISECLIPSE_CENTRAL_PASSWORD: ${{ secrets.RISECLIPSE_CENTRAL_PASSWORD }}
 

.github/workflows/Release-Snapshot-On-Maven-Central.yml

@@ -0,0 +1,36 @@
+# *************************************************************************
+# **  Copyright (c) 2025 CentraleSupélec & EDF.
+# **  All rights reserved. This program and the accompanying materials
+# **  are made available under the terms of the Eclipse Public License v2.0
+# **  which accompanies this distribution, and is available at
+# **  https://www.eclipse.org/legal/epl-v20.html
+# ** 
+# **  This file is part of the RiseClipse tool
+# **  
+# **  Contributors:
+# **      Computer Science Department, CentraleSupélec
+# **      EDF R&D
+# **  Contacts:
+# **      dominique.marcadet@centralesupelec.fr
+# **      aurelie.dehouck-neveu@edf.fr
+# **  Web site:
+# **      https://riseclipse.github.io
+# *************************************************************************
+
+name: Release snapshots on Maven Central
+
+on:
+  push:
+    branches:
+      - 'develop'
+
+jobs:
+  call-release-snapshot-on-maven-central-workflow:
+    name: Release snapshots on Maven Central
+    uses: riseclipse/riseclipse-developer/.github/workflows/Shared-Deploy-Snapshot-Components.yml@develop
+    with:
+      run_sonarqube: true
+    secrets:
+      RISECLIPSE_CENTRAL_USERNAME: ${{ secrets.RISECLIPSE_CENTRAL_USERNAME }}
+      RISECLIPSE_CENTRAL_PASSWORD: ${{ secrets.RISECLIPSE_CENTRAL_PASSWORD }}
+      SONAR_TOKEN: ${{ secrets.RISECLIPSE_SONAR_TOKEN }}

.github/workflows/Verify.yml

@@ -1,5 +1,5 @@
 # *************************************************************************
-# **  Copyright (c) 2022 CentraleSupélec & EDF.
+# **  Copyright (c) 2022-2025 CentraleSupélec & EDF.
 # **  All rights reserved. This program and the accompanying materials
 # **  are made available under the terms of the Eclipse Public License v2.0
 # **  which accompanies this distribution, and is available at
@@ -22,11 +22,13 @@ name: Build
 # This workflow is triggered on every push to verify that the project builds correctly and runs Sonar + Unit tests
 
 on: 
-  push
+  pull_request:
+    branches:
+      - master
 
 jobs:
   call-verify-workflow:
     name: Verify Project
     uses: riseclipse/riseclipse-developer/.github/workflows/Shared-Verify-Components.yml@master
-    with:
-      run_sonarqube: false
+    secrets:
+      SONAR_TOKEN: ${{ secrets.RISECLIPSE_SONAR_TOKEN }}

fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/.classpath

@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21

fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/META-INF/MANIFEST.MF

@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit;singleton:=true
 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit
-Bundle-Version: 1.2.11
+Bundle-Version: 1.2.12.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider.NSDEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
- fr.centralesupelec.edf.riseclipse.iec61850.nsd;bundle-version="1.2.8";visibility:=reexport
+ fr.centralesupelec.edf.riseclipse.iec61850.nsd;bundle-version="1.2.12";visibility:=reexport
 Bundle-ActivationPolicy: lazy

fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttributes_constructedAttribute_ServiceTypeRealization.gif

@@ -605,3 +605,45 @@ _UI_CDC_parameterizedDataAttribute_feature = Parameterized Data Attribute
 _UI_ServiceConstructedAttribute_parameterizedSubDataAttribute_feature = Parameterized Sub Data Attribute
 _UI_CDC_parameterizedDataAttributeNames_feature = Parameterized Data Attribute Names
 _UI_ServiceConstructedAttribute_parameterizedSubDataAttributeNames_feature = Parameterized Sub Data Attribute Names
+_UI_AgNSDIdentification_type = Ag NSD Identification
+_UI_AgNSDIdentification_nsdVersion_feature = Nsd Version
+_UI_AgNSDIdentification_nsdRevision_feature = Nsd Revision
+_UI_AgNSDIdentification_nsdRelease_feature = Nsd Release
+_UI_AgNSIdentification_namespaceType_feature = Namespace Type
+_UI_NSType_basic_literal = basic
+_UI_NSType_domain_literal = domain
+_UI_NSType_transitional_literal = transitional
+_UI_NSType_product_literal = product
+_UI_NSType_private_literal = private
+_UI_AgDependsOn_type = Ag Depends On
+_UI_AgDependsOn_id_feature = Id
+_UI_AgDependsOn_version_feature = Version
+_UI_AgDependsOn_revision_feature = Revision
+_UI_AgDependsOn_dependencyType_feature = Dependency Type
+_UI_NSDependencyType_dependsOn_literal = dependsOn
+_UI_NSDependencyType_includes_literal = includes
+_UI_NSDependencyType_extends_literal = extends
+_UI_PubStage_draftDC_literal = draftDC
+_UI_PubStage_DC_literal = DC
+_UI_PubStage_draftDC2_literal = draftDC2
+_UI_PubStage_DC2_literal = DC2
+_UI_PubStage_draftCD_literal = draftCD
+_UI_PubStage_draftCD2_literal = draftCD2
+_UI_PubStage_CD2_literal = CD2
+_UI_PubStage_draftCD3_literal = draftCD3
+_UI_PubStage_CD3_literal = CD3
+_UI_PubStage_draftCDV_literal = draftCDV
+_UI_PubStage_draftDTS_literal = draftDTS
+_UI_PubStage_draftDTR_literal = draftDTR
+_UI_PubStage_draftFDIS_literal = draftFDIS
+_UI_PubStage_draftTS_literal = draftTS
+_UI_PubStage_draftTR_literal = draftTR
+_UI_PubStage_draftIS_literal = draftIS
+_UI_PubStage_PAS_literal = PAS
+_UI_DefinedAttributeTypeKind_SCSM_literal = SCSM
+_UI_Changes_mergedNamespaces_feature = Merged Namespaces
+_UI_AgNSIdentification_deprecated_feature = Deprecated
+_UI_AgUnderlyingType_underlyingControlType_feature = Underlying Control Type
+_UI_AgUML_appVersion_feature = App Version
+_UI_ServiceTypeRealization_realize_feature = Realize
+_UI_ServiceTypeRealization_parentServiceTypeRealizations_feature = Parent Service Type Realizations

fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceTypeRealizations_serviceTypeRealization_ServiceTypeRealization.gif

@@ -28,6 +28,7 @@
   <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit</artifactId>
   <version>1.2.12-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+  <name>[bundle] RiseClipse Metamodel NSD2016 Edit Support</name>
 
   <parent>
     <groupId>io.github.riseclipse</groupId>