Update for osate 2.13

.github/workflows/build_and_test.yml

@@ -13,9 +13,9 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set Up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'

.github/workflows/build_maven.yml

@@ -20,9 +20,9 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set Up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'

.github/workflows/release.yml

@@ -24,9 +24,9 @@ jobs:
     needs: parse_tag
     if: ${{ needs.parse_tag.outputs.suffix == 'RELEASE' }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set Up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -60,17 +60,17 @@ jobs:
     needs: [verify, parse_tag, parse_version]
     if: ${{ needs.parse_tag.outputs.version == needs.parse_version.outputs.version }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set Up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Install Eclipse
       run: sudo snap install --classic eclipse
     - name: Checkout current update site
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: loonwerks/AGREE-Updates
         path: AGREE-Updates

.github/workflows/snapshot.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success'}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set Up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -32,16 +32,16 @@ jobs:
     runs-on: ubuntu-latest
     needs: verify
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
     - name: Install Eclipse
       run: sudo snap install --classic eclipse
     - name: Checkout current update site
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: loonwerks/AGREE-Updates
         path: AGREE-Updates
@@ -77,11 +77,11 @@ jobs:
       delete_snapshots: ${{ steps.python_script.outputs.delete_snapshots }}
       matrix: ${{ steps.python_script.outputs.snapshots_to_delete }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0 
     - name: Set Up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -90,7 +90,7 @@ jobs:
       with:
         python-version: '3.x'
     - name: Checkout current update site
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: loonwerks/AGREE-Updates
         path: AGREE-Updates
@@ -130,17 +130,17 @@ jobs:
         version: ${{ fromJson(needs.find_snapshots_to_delete.outputs.matrix) }}
       max-parallel: 1
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set Up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Install Eclipse
       run: sudo snap install --classic eclipse
     - name: Checkout current update site
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: loonwerks/AGREE-Updates
         path: AGREE-Updates

agree-releng/version-management/release.properties

@@ -1,6 +1,6 @@
 #
 #Fri Oct 23 08:24:11 EDT 2020
-root.projects=com.rockwellcollins.atc.agree.feature com.rockwellcollins.atc.tcg.feature edu.uah.rsesc.aadlsimulator.feature edu.uah.rsesc.aadlsimulator.agree.feature
+root.projects=com.rockwellcollins.atc.agree.feature com.rockwellcollins.atc.agree.examples.feature com.rockwellcollins.atc.tcg.feature edu.uah.rsesc.aadlsimulator.feature edu.uah.rsesc.aadlsimulator.agree.feature
 provide.service=true
 show.deviations=true
 baseline.for.integration=false

agree-releng/version-management/release.xml

@@ -9,8 +9,8 @@
 		<plugin name="com.collins.trustedsystems.z3.macosx.cocoa.x86_64" fragment="true" version="4.8.14"/>
 		<plugin name="com.collins.trustedsystems.z3.win32.win32.x86_64" fragment="true" version="4.8.14"/>
 	</feature>
-	<feature name="com.rockwellcollins.atc.agree.examples.feature" version="1.0.0">
-		<plugin name="com.rockwellcollins.atc.agree.examples" version="1.0.0"/>
+	<feature name="com.rockwellcollins.atc.agree.examples.feature" version="1.0.2">
+		<plugin name="com.rockwellcollins.atc.agree.examples" version="1.0.2"/>
 	</feature>
 	<feature name="com.rockwellcollins.atc.agree.feature" version="2.9.0">
 		<feature name="com.rockwellcollins.atc.agree.examples.feature" version="1.0.0"/>
@@ -36,7 +36,7 @@
 		<plugin name="edu.uah.rsesc.aadlsimulator.ui" version="2.8.1"/>
 		<plugin name="edu.uah.rsesc.aadlsimulator.xtext" version="3.0.1"/>
 		<plugin name="edu.uah.rsesc.aadlsimulator.xtext.ui" version="3.0.1"/>
-		<plugin name="edu.uah.rsesc.aadlsimulator.doc" version="2.7.2"/>
+		<plugin name="edu.uah.rsesc.aadlsimulator.doc" version="2.7.3"/>
 	</feature>
 	<plugin name="com.collins.trustedsystems.jkindapi" version="4.5.1"/>
 	<plugin name="com.collins.trustedsystems.z3" version="4.8.14"/>

com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF

@@ -2,16 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AGREE Analysis
 Bundle-SymbolicName: com.rockwellcollins.atc.agree.analysis; singleton:=true
-Bundle-Version: 2.10.1.qualifier
+Bundle-Version: 2.10.2.qualifier
 Bundle-Activator: com.rockwellcollins.atc.agree.analysis.Activator
 Bundle-Vendor: Rockwell Collins, Inc.
-Require-Bundle: org.osate.aadl2.modelsupport;bundle-version="[7.0.0,8.0.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
+ org.osate.aadl2.modelsupport;bundle-version="[7.0.0,8.0.0)",
  org.eclipse.ui.console;bundle-version="[3.5.100,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.4.401,4.0.0)",
  org.osate.aadl2;bundle-version="[5.0.0,6.0.0)",
  org.osate.ui;bundle-version="[6.0.0,7.0.0)",
  org.osate.xtext.aadl2.properties;bundle-version="[3.0.0,4.0.0)",
- com.rockwellcollins.atc.agree.ui;bundle-version="[3.2.0,4.0.0)",
+ com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)",
+ com.rockwellcollins.atc.agree.ui;bundle-version="[4.0.0,5.0.0)",
  org.osate.ge;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
  com.collins.trustedsystems.z3;bundle-version="[4.0.0,5.0.0)",
  org.osate.aadl2.instantiation;bundle-version="[3.0.0,4.0.0)",
  org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)",
@@ -21,14 +27,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/gson.jar
-Export-Package: com.rockwellcollins.atc.agree.analysis;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.ast;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.ast.visitors;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.extentions;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.handlers;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.lustre.visitors;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.preferences;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.saving;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.translation;version="2.10.1",
- com.rockwellcollins.atc.agree.analysis.views;version="2.10.1"
+Import-Package: org.apache.commons.lang;version="[2.6.0,3.0.0)"
+Export-Package: com.rockwellcollins.atc.agree.analysis;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.ast;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.ast.visitors;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.extentions;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.handlers;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.lustre.visitors;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.preferences;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.saving;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.translation;version="2.10.2",
+ com.rockwellcollins.atc.agree.analysis.views;version="2.10.2"
 Automatic-Module-Name: com.rockwellcollins.atc.agree.analysis

com.rockwellcollins.atc.agree.analysis/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright (c) 2022, Collins Aerospace.
+ * Copyright (c) 2024, Collins Aerospace.
  * Developed with the sponsorship of Defense Advanced Research Projects Agency (DARPA).
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this data, 
@@ -27,7 +27,7 @@
     <version>2.10.1-SNAPSHOT</version>
   </parent>
   <artifactId>com.rockwellcollins.atc.agree.analysis</artifactId>
-  <version>2.10.1-SNAPSHOT</version>
+  <version>2.10.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 	<properties>

com.rockwellcollins.atc.agree.codegen/.project

@@ -25,11 +25,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
 			<arguments>
@@ -68,6 +63,11 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF

@@ -8,8 +8,8 @@ Bundle-Vendor: ROCKWELLCOLLINS
 Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
  org.osate.aadl2;bundle-version="[5.0.0,6.0.0)",
- com.rockwellcollins.atc.agree.analysis;bundle-version="[2.10.0,3.0.0)",
- com.rockwellcollins.atc.agree;bundle-version="[3.1.0,4.0.0)",
+ com.rockwellcollins.atc.agree.analysis;bundle-version="[2.8.0,3.0.0)",
+ com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)",
  org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)",
  org.osate.xtext.aadl2.properties;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.1,4.0.0)",

com.rockwellcollins.atc.agree.doc/.project

@@ -25,11 +25,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
 			<arguments>
@@ -68,6 +63,11 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

com.rockwellcollins.atc.agree.doc/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AGREE Documentation
 Bundle-SymbolicName: com.rockwellcollins.atc.agree.doc;singleton:=true
-Bundle-Version: 2.9.2.qualifier
+Bundle-Version: 2.10.0.qualifier
 Bundle-Vendor: ROCKWELLCOLLINS
 Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)"

com.rockwellcollins.atc.agree.doc/build_docs.xml

@@ -47,10 +47,15 @@
 	<target name="build_user_guide_eclipse" description="Build the user guide">
 		<mkdir dir="${user_guide_output.dir}" />
 
+		<echo message="eclipse user guide output path: ${user_guide_output.dir}"/>
+
 		<fileset id="markdown-files" dir="${user_guide.dir}" includes="*.markdown"/>
 		<pathconvert refid="markdown-files" pathsep=" " property="markdown-file-list"/>
 
-		<apply executable="pandoc" dir="${user_guide.dir}" dest="${user_guide_output.dir}" parallel="false">
+		<property name="markdown-files.prop" refid='markdown-files'/>
+		<echo message="markdown input files: ${markdown-files.prop}"/>
+
+		<apply executable="pandoc" dir="${user_guide.dir}" dest="${user_guide_output.dir}" parallel="false" outputproperty="true">
 			<arg value="-o"/>
 			<targetfile/>
 			<arg value="-s"/>

com.rockwellcollins.atc.agree.doc/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright (c) 2022, Collins Aerospace.
+ * Copyright (c) 2024, Collins Aerospace.
  * Developed with the sponsorship of Defense Advanced Research Projects Agency (DARPA).
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this data, 
@@ -27,7 +27,7 @@
     <version>2.10.1-SNAPSHOT</version>
   </parent>
   <artifactId>com.rockwellcollins.atc.agree.doc</artifactId>
-  <version>2.9.2-SNAPSHOT</version>
+  <version>2.10.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

com.rockwellcollins.atc.agree.examples/META-INF/MANIFEST.MF

@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Examples
 Bundle-SymbolicName: com.rockwellcollins.atc.agree.examples;singleton:=true
-Bundle-Version: 1.0.3.qualifier
+Bundle-Version: 1.0.2.qualifier
 Automatic-Module-Name: com.rockwellcollins.atc.agree.examples
-Require-Bundle: com.rockwellcollins.atc.agree.ui;bundle-version="[3.1.0,4.0.0)"
+Require-Bundle: com.rockwellcollins.atc.agree.ui;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: Collins Aerospace
 Eclipse-BundleShape: dir

com.rockwellcollins.atc.agree.examples/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright (c) 2022, Collins Aerospace.
+ * Copyright (c) 2024, Collins Aerospace.
  * Developed with the sponsorship of Defense Advanced Research Projects Agency (DARPA).
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this data, 
@@ -30,7 +30,7 @@
 
 	<groupId>com.rockwellcollins.atc.agree</groupId>
 	<artifactId>com.rockwellcollins.atc.agree.examples</artifactId>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>

com.rockwellcollins.atc.agree.feature/.project

@@ -15,11 +15,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.oomph.version.VersionBuilder</name>
 			<arguments>
@@ -53,6 +48,11 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>