Moving from Capella 6.1.0 to Capella 7.0.0.

features/org.obeonetwork.capella.m2doc.aql.queries.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.obeonetwork.capella.m2doc.aql.queries.feature"
       label="Capella doc generation utils"
-      version="6.1.0.qualifier"
+      version="7.0.0.qualifier"
       provider-name="Obeo Network"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">

features/org.obeonetwork.capella.m2doc.aql.queries.feature/pom.xml

@@ -17,10 +17,10 @@
     <groupId>org.obeonetwork.capella.extensions</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../..</relativePath>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
   </parent>
   <groupId>org.obeonetwork.capella.extensions</groupId>
   <artifactId>org.obeonetwork.capella.m2doc.aql.queries.feature</artifactId>
-  <version>6.1.0-SNAPSHOT</version>
+  <version>7.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

features/org.obeonetwork.capella.m2doc.commandline.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.obeonetwork.capella.m2doc.commandline.feature"
       label="Capella doc generation command line"
-      version="6.1.0.qualifier"
+      version="7.0.0.qualifier"
       provider-name="Obeo Network"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">

features/org.obeonetwork.capella.m2doc.commandline.feature/pom.xml

@@ -17,10 +17,10 @@
     <groupId>org.obeonetwork.capella.extensions</groupId>
     <artifactId>parent</artifactId>
     <relativePath>../..</relativePath>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
   </parent>
   <groupId>org.obeonetwork.capella.extensions</groupId>
   <artifactId>org.obeonetwork.capella.m2doc.commandline.feature</artifactId>
-  <version>6.1.0-SNAPSHOT</version>
+  <version>7.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

plugins/org.obeonetwork.capella.m2doc.aql.queries/META-INF/MANIFEST.MF

@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.obeonetwork.capella.m2doc.aql.queries;singleton:=true
-Bundle-Version: 6.1.0.qualifier
+Bundle-Version: 7.0.0.qualifier
 Bundle-Activator: org.obeonetwork.capella.m2doc.aql.queries.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.polarsys.capella.common;bundle-version="[6.1.0,6.1.1)",
- org.polarsys.capella.core.data.gen;bundle-version="[6.1.0,6.1.1)",
+ org.polarsys.capella.common;bundle-version="[7.0.0,7.1.0)",
+ org.polarsys.capella.core.data.gen;bundle-version="[7.0.0,7.1.0)",
  org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui,
  org.eclipse.emf.common.ui;bundle-version="[2.7.0,3.0.0)",
  org.obeonetwork.m2doc.ide;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.acceleo.annotations;bundle-version="[5.0.1,8.0.0)",
- org.polarsys.capella.core.data.helpers;bundle-version="[6.1.0,6.1.1)",
- org.polarsys.capella.core.libraries;bundle-version="[6.1.0,6.1.1)",
- org.polarsys.capella.core.model.helpers;bundle-version="[6.1.0,6.1.1)",
+ org.polarsys.capella.core.data.helpers;bundle-version="[7.0.0,7.1.0)",
+ org.polarsys.capella.core.libraries;bundle-version="[7.0.0,7.1.0)",
+ org.polarsys.capella.core.model.helpers;bundle-version="[7.0.0,7.1.0)",
  org.eclipse.acceleo.query,
- org.polarsys.capella.core.sirius.analysis;bundle-version="[6.1.0,6.1.1)",
- org.polarsys.capella.common.re.ui;bundle-version="[6.1.0,6.1.1)",
- org.polarsys.capella.core.semantic.queries;bundle-version="[6.1.0,6.1.1)",
- org.polarsys.capella.common.re.gen;bundle-version="[6.1.0,6.1.1)"
+ org.polarsys.capella.core.sirius.analysis;bundle-version="[7.0.0,7.1.0)",
+ org.polarsys.capella.common.re.ui;bundle-version="[7.0.0,7.1.0)",
+ org.polarsys.capella.core.semantic.queries;bundle-version="[7.0.0,7.1.0)",
+ org.polarsys.capella.common.re.gen;bundle-version="[7.0.0,7.1.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName

plugins/org.obeonetwork.capella.m2doc.aql.queries/plugin.xml

@@ -318,70 +318,67 @@
                class="org.polarsys.capella.core.data.helpers.ctx.services.MissionExt">
          </service>
          <package
-               uri="http://www.polarsys.org/capella/core/ctx/6.0.0">
+               uri="http://www.polarsys.org/capella/core/ctx/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/core/6.0.0">
+               uri="http://www.polarsys.org/capella/core/core/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/modeller/6.0.0">
+               uri="http://www.polarsys.org/capella/core/modeller/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/information/6.0.0">
+               uri="http://www.polarsys.org/capella/core/information/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/common/behavior/6.0.0">
+               uri="http://www.polarsys.org/capella/common/behavior/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/fa/6.0.0">
+               uri="http://www.polarsys.org/capella/core/fa/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/requirement/6.0.0">
+               uri="http://www.polarsys.org/capella/core/oa/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/oa/6.0.0">
+               uri="http://www.polarsys.org/capella/core/information/datavalue/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/information/datavalue/6.0.0">
+               uri="http://www.polarsys.org/capella/core/epbs/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/epbs/6.0.0">
+               uri="http://www.polarsys.org/capella/common/activity/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/common/activity/6.0.0">
+               uri="http://www.polarsys.org/capella/common/re/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/common/re/6.0.0">
+               uri="http://www.polarsys.org/capella/core/interaction/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/interaction/6.0.0">
+               uri="http://www.polarsys.org/capella/core/information/communication/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/information/communication/6.0.0">
+               uri="http://www.polarsys.org/capella/core/la/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/la/6.0.0">
+               uri="http://www.polarsys.org/capella/core/information/datatype/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/information/datatype/6.0.0">
+               uri="http://www.polarsys.org/capella/core/pa/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/pa/6.0.0">
+               uri="http://www.polarsys.org/capella/core/cs/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/cs/6.0.0">
+               uri="http://www.polarsys.org/capella/common/core/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/common/core/6.0.0">
+               uri="http://www.polarsys.org/capella/core/sharedmodel/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/sharedmodel/6.0.0">
+               uri="http://www.polarsys.org/capella/core/common/7.0.0">
          </package>
          <package
-               uri="http://www.polarsys.org/capella/core/common/6.0.0">
-         </package>
-         <package
-               uri="http://www.polarsys.org/capella/core/pa/deployment/6.0.0">
+               uri="http://www.polarsys.org/capella/core/pa/deployment/7.0.0">
          </package>
          <package
                uri="http://www.eclipse.org/sirius/1.1.0">
@@ -515,9 +512,6 @@
          <service
                class="org.polarsys.capella.core.sirius.analysis.PhysicalServices">
          </service>
-         <service
-               class="org.polarsys.capella.core.sirius.analysis.RequirementServices">
-         </service>
          <service
                class="org.polarsys.capella.core.sirius.analysis.SequenceDiagramServices">
          </service>

plugins/org.obeonetwork.capella.m2doc.aql.queries/pom.xml

@@ -17,11 +17,11 @@
 		<groupId>org.obeonetwork.capella.extensions</groupId>
 		<artifactId>parent</artifactId>
 		<relativePath>../..</relativePath>
-		<version>6.1.0-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
 	</parent>
   <groupId>org.obeonetwork.capella.extensions</groupId>
   <artifactId>org.obeonetwork.capella.m2doc.aql.queries</artifactId>
-  <version>6.1.0-SNAPSHOT</version>
+  <version>7.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
@@ -31,7 +31,7 @@
 
   <build>
     <plugins>
-      <plugin>
+      <!--plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>${antrun-version}</version>
@@ -44,7 +44,7 @@
             </goals>
             <configuration>
               <target>
-              <delete dir="${tempFolder}"/>
+                <delete dir="${tempFolder}"/>
                 <unzip src="${basedir}/zips/m2docife.zip" dest="${tempFolder}"/>
                 <copy file="${testsPluginFolder}/resources/IFE/LA-Complete/LA-Complete-expected-generation.docx" tofile="${tempFolder}/generated/LA_Complete.docx"/>
                 <copy file="${testsPluginFolder}/resources/IFE/SA-Complete/SA-Complete-expected-generation.docx" tofile="${tempFolder}/generated/SA_Complete.docx"/>
@@ -65,7 +65,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin-->
     </plugins>
   </build>
 </project>

plugins/org.obeonetwork.capella.m2doc.aql.queries/src/org/obeonetwork/capella/m2doc/aql/queries/SemanticBrowserServices.java

@@ -123,7 +123,6 @@
 import org.polarsys.capella.core.data.oa.Role;
 import org.polarsys.capella.core.data.pa.PhysicalComponent;
 import org.polarsys.capella.core.data.pa.PhysicalFunction;
-import org.polarsys.capella.core.data.requirement.Requirement;
 import org.polarsys.kitalpha.emde.model.Element;
 
 /**
@@ -352,23 +351,6 @@ public List<PropertyValueGroup> getAppliedPropertyValueGroups(CapellaElement val
                         .compute(value));
     }
 
-    // @formatter:off
-    @Documentation(
-        value = "Returns the Sequence of requirements for the given CapellaElement.",
-        params = {
-            @Param(name = "value", value = "the CapellaElement")
-        },
-        result = "the Sequence of requirements for the given CapellaElement",
-        examples = {
-            @Example(expression = "myCapellaElement.getRequirements()", result = "the Sequence of requirements for the given CapellaElement"),
-        }
-    )
-    // @formatter:on
-    public List<TraceableElement> getRequirements(CapellaElement value) {
-        return castList(new org.polarsys.capella.core.semantic.queries.basic.queries.CapellaElement_requirement()
-                .compute(value));
-    }
-
     // @formatter:off
     @Documentation(
         value = "Returns the Sequence of applied property values for the given CapellaElement.",
@@ -2561,24 +2543,6 @@ public List<Component> getDeployedPhysicalComponents(PhysicalComponent value) {
                         .compute(value));
     }
 
-    // @formatter:off
-    @Documentation(
-        value = "Returns the Sequence of incoming physical links for the given PhysicalComponent.",
-        params = {
-            @Param(name = "value", value = "the PhysicalComponent")
-        },
-        result = "the Sequence of incoming physical links for the given PhysicalComponent",
-        examples = {
-            @Example(expression = "myPhysicalComponent.getIncomingPhysicalLinks()", result = "the Sequence of incoming physical links for the given PhysicalComponent"),
-        }
-    )
-    // @formatter:on
-    public List<PhysicalLink> getIncomingPhysicalLinks(PhysicalComponent value) {
-        return castList(
-                new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalComponent_IncomingPhysicalLinks()
-                        .compute(value));
-    }
-
     // @formatter:off
     @Documentation(
         value = "Returns the Sequence of allocated physical functions for the given PhysicalComponent.",
@@ -2648,24 +2612,6 @@ public List<Component> getRealizingComponents(PhysicalComponent value) {
                 .compute(value));
     }
 
-    // @formatter:off
-    @Documentation(
-        value = "Returns the Sequence of outgoing physical links for the given PhysicalComponent.",
-        params = {
-            @Param(name = "value", value = "the PhysicalComponent")
-        },
-        result = "the Sequence of outgoing physical links for the given PhysicalComponent",
-        examples = {
-            @Example(expression = "myPhysicalComponent.getOutgoingPhysicalLinks()", result = "the Sequence of outgoing physical links for the given PhysicalComponent"),
-        }
-    )
-    // @formatter:on
-    public List<PhysicalLink> getOutgoingPhysicalLinks(PhysicalComponent value) {
-        return castList(
-                new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalComponent_OutgoingPhysicalLinks()
-                        .compute(value));
-    }
-
     // @formatter:off
     @Documentation(
         value = "Returns the Sequence of deploying physical components for the given PhysicalComponent.",
@@ -3064,23 +3010,6 @@ public List<PhysicalLinkCategory> getCategories(PhysicalLink value) {
                 new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalLinkCategories().compute(value));
     }
 
-    // @formatter:off
-    @Documentation(
-        value = "Returns the Sequence of physical links ends for the given PhysicalLink.",
-        params = {
-            @Param(name = "value", value = "the PhysicalLink")
-        },
-        result = "the Sequence of physical links ends for the given PhysicalLink",
-        examples = {
-            @Example(expression = "myPhysicalLink.getPhysicalLinkEnds()", result = "the Sequence of physical links ends for the given PhysicalLink"),
-        }
-    )
-    // @formatter:on
-    public List<Component> getPhysicalLinkEnds(PhysicalLink value) {
-        return castList(new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalLinkSourceAndTarget()
-                .compute(value));
-    }
-
     // @formatter:off
     @Documentation(
         value = "Returns the Sequence of realizing configuration items for the given PhysicalLink.",
@@ -3307,23 +3236,6 @@ public List<ComponentExchange> getOutgoingDelegations(PhysicalPort value) {
                 .compute(value));
     }
 
-    // @formatter:off
-    @Documentation(
-        value = "Returns the Sequence of physical links for the given PhysicalPort.",
-        params = {
-            @Param(name = "value", value = "the PhysicalPort")
-        },
-        result = "the Sequence of physical links for the given PhysicalPort",
-        examples = {
-            @Example(expression = "myPhysicalPort.getPhysicalLinks()", result = "the Sequence of physical links for the given PhysicalPort"),
-        }
-    )
-    // @formatter:on
-    public List<PhysicalLink> getPhysicalLinks(PhysicalPort value) {
-        return castList(new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalPortIncomingPhysicalLinks()
-                .compute(value));
-    }
-
     // @formatter:off
     @Documentation(
         value = "Returns the Sequence of realizing configuration items for the given PhysicalPort.",
@@ -3833,23 +3745,6 @@ public List<TraceableElement> getSource(Trace value) {
                 .compute(value));
     }
 
-    // @formatter:off
-    @Documentation(
-        value = "Returns the Sequence of traced elements for the given Requirement.",
-        params = {
-            @Param(name = "value", value = "the Requirement")
-        },
-        result = "the Sequence of traced elements for the given Requirement",
-        examples = {
-            @Example(expression = "myRequirement.getTracedElements()", result = "the Sequence of traced elements for the given Requirement"),
-        }
-    )
-    // @formatter:on
-    public List<TraceableElement> getTracedElements(Requirement value) {
-        return castList(new org.polarsys.capella.core.semantic.queries.basic.queries.RequirementTracedElements()
-                .compute(value));
-    }
-
     // @formatter:off
     @Documentation(
         value = "Returns the Sequence of functional echanges for the given ExchangeCategory.",

plugins/org.obeonetwork.capella.m2doc.commandline/META-INF/MANIFEST.MF

@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.obeonetwork.capella.m2doc.commandline;singleton:=true
-Bundle-Version: 6.1.0.qualifier
+Bundle-Version: 7.0.0.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
- org.polarsys.capella.core.commandline.core;bundle-version="[6.1.0,6.1.1)",
+ org.polarsys.capella.core.commandline.core;bundle-version="[7.0.0,7.1.0)",
  org.obeonetwork.m2doc;bundle-version="[3.1.0,4.0.0)",
  org.obeonetwork.m2doc.genconf;bundle-version="[3.1.0,4.0.0)",
  org.obeonetwork.m2doc.ide;bundle-version="[3.0.0,4.0.0)",