From 0fa3d5c3881878f45483f5a42490e5a25017c85b Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Tue, 27 Feb 2024 14:47:07 -0600 Subject: [PATCH 01/15] Update target for OSATE 2.13.0 --- ...om.rockwellcollins.atc.agree.target.target | 67 +++++-------------- 1 file changed, 15 insertions(+), 52 deletions(-) diff --git a/com.rockwellcollins.atc.agree.target/com.rockwellcollins.atc.agree.target.target b/com.rockwellcollins.atc.agree.target/com.rockwellcollins.atc.agree.target.target index cea95124c..d677317a7 100644 --- a/com.rockwellcollins.atc.agree.target/com.rockwellcollins.atc.agree.target.target +++ b/com.rockwellcollins.atc.agree.target/com.rockwellcollins.atc.agree.target.target @@ -1,6 +1,6 @@ - + @@ -21,67 +21,30 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + @@ -95,25 +58,25 @@ - + - + - - - - + + + + - - + + - \ No newline at end of file + From 69a0223a1280776096feca79ef90fe027a02a6d9 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Wed, 28 Feb 2024 06:36:49 -0600 Subject: [PATCH 02/15] Update parent pom dependencies --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e64ef793a..41faf5981 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ http://download.eclipse.org - 2.27.0 + 2.30.0 @@ -487,12 +487,12 @@ Eclipse p2 - ${eclipse.mirror}/releases/2022-06/ + ${eclipse.mirror}/releases/2023-03/ Osate2 p2 - https://osate-build.sei.cmu.edu/download/osate/stable/2.12.0-vfinal/updates/ + https://osate-build.sei.cmu.edu/download/osate/stable/2.13.0-vfinal/updates/ codehaus-snapshots From cf11e84440b104bebeae7726c224bf0e7a54921a Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Wed, 28 Feb 2024 06:58:32 -0600 Subject: [PATCH 03/15] Update to tycho 2.7.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 41faf5981..4280ea954 100644 --- a/pom.xml +++ b/pom.xml @@ -33,8 +33,8 @@ 17 --> - 2.7.3 - 2.7.3 + 2.7.5 + 2.7.5 From 30844562e912fa76e7e8a3db8cf0181b001d0cf6 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Wed, 28 Feb 2024 06:59:45 -0600 Subject: [PATCH 04/15] Update eclipse-maven .project files --- com.rockwellcollins.atc.agree.codegen/.project | 10 +++++----- com.rockwellcollins.atc.agree.doc/.project | 10 +++++----- com.rockwellcollins.atc.agree.feature/.project | 10 +++++----- com.rockwellcollins.atc.agree.ui/.project | 10 +++++----- com.rockwellcollins.atc.agree/.project | 10 +++++----- com.rockwellcollins.atc.tcg.feature/.project | 10 +++++----- com.rockwellcollins.atc.tcg/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator.agree.feature/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator.agree.ui/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator.agree/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator.doc/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator.feature/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator.ui/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator.xtext.ui/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator.xtext/.project | 10 +++++----- edu.uah.rsesc.aadlsimulator/.project | 10 +++++----- edu.uah.rsesc.agree.ge.ui/.project | 10 +++++----- edu.uah.rsesc.agree.ge/.project | 10 +++++----- 18 files changed, 90 insertions(+), 90 deletions(-) diff --git a/com.rockwellcollins.atc.agree.codegen/.project b/com.rockwellcollins.atc.agree.codegen/.project index 4cb1536ab..1bb15f079 100644 --- a/com.rockwellcollins.atc.agree.codegen/.project +++ b/com.rockwellcollins.atc.agree.codegen/.project @@ -25,11 +25,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.pde.api.tools.apiAnalysisBuilder @@ -68,6 +63,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.xtext.ui.shared.xtextNature diff --git a/com.rockwellcollins.atc.agree.doc/.project b/com.rockwellcollins.atc.agree.doc/.project index 9bfb955fb..45900a0a4 100644 --- a/com.rockwellcollins.atc.agree.doc/.project +++ b/com.rockwellcollins.atc.agree.doc/.project @@ -25,11 +25,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.pde.api.tools.apiAnalysisBuilder @@ -68,6 +63,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.xtext.ui.shared.xtextNature diff --git a/com.rockwellcollins.atc.agree.feature/.project b/com.rockwellcollins.atc.agree.feature/.project index b48f00c9f..aef0fc1d4 100644 --- a/com.rockwellcollins.atc.agree.feature/.project +++ b/com.rockwellcollins.atc.agree.feature/.project @@ -15,11 +15,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -53,6 +48,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.xtext.ui.shared.xtextNature diff --git a/com.rockwellcollins.atc.agree.ui/.project b/com.rockwellcollins.atc.agree.ui/.project index a7ab85001..0cb0be4c3 100644 --- a/com.rockwellcollins.atc.agree.ui/.project +++ b/com.rockwellcollins.atc.agree.ui/.project @@ -25,11 +25,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.pde.api.tools.apiAnalysisBuilder @@ -68,6 +63,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature diff --git a/com.rockwellcollins.atc.agree/.project b/com.rockwellcollins.atc.agree/.project index 5224799a2..1f2c1b321 100644 --- a/com.rockwellcollins.atc.agree/.project +++ b/com.rockwellcollins.atc.agree/.project @@ -25,11 +25,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.pde.api.tools.apiAnalysisBuilder @@ -68,6 +63,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature diff --git a/com.rockwellcollins.atc.tcg.feature/.project b/com.rockwellcollins.atc.tcg.feature/.project index 820dc2515..737f8420b 100644 --- a/com.rockwellcollins.atc.tcg.feature/.project +++ b/com.rockwellcollins.atc.tcg.feature/.project @@ -10,11 +10,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -48,6 +43,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.FeatureNature diff --git a/com.rockwellcollins.atc.tcg/.project b/com.rockwellcollins.atc.tcg/.project index f7f6b7829..f3d26b453 100644 --- a/com.rockwellcollins.atc.tcg/.project +++ b/com.rockwellcollins.atc.tcg/.project @@ -20,11 +20,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -63,6 +58,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature diff --git a/edu.uah.rsesc.aadlsimulator.agree.feature/.project b/edu.uah.rsesc.aadlsimulator.agree.feature/.project index 4bfe26b1b..7b792e147 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.feature/.project +++ b/edu.uah.rsesc.aadlsimulator.agree.feature/.project @@ -10,11 +10,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -48,6 +43,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.FeatureNature diff --git a/edu.uah.rsesc.aadlsimulator.agree.ui/.project b/edu.uah.rsesc.aadlsimulator.agree.ui/.project index 8ccee9871..23cfb8ec2 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.ui/.project +++ b/edu.uah.rsesc.aadlsimulator.agree.ui/.project @@ -20,11 +20,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -63,6 +58,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature diff --git a/edu.uah.rsesc.aadlsimulator.agree/.project b/edu.uah.rsesc.aadlsimulator.agree/.project index 3cd009ae9..68ff1e644 100644 --- a/edu.uah.rsesc.aadlsimulator.agree/.project +++ b/edu.uah.rsesc.aadlsimulator.agree/.project @@ -20,11 +20,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -63,6 +58,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature diff --git a/edu.uah.rsesc.aadlsimulator.doc/.project b/edu.uah.rsesc.aadlsimulator.doc/.project index 98038c073..33ddf75e4 100644 --- a/edu.uah.rsesc.aadlsimulator.doc/.project +++ b/edu.uah.rsesc.aadlsimulator.doc/.project @@ -15,11 +15,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -53,6 +48,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature diff --git a/edu.uah.rsesc.aadlsimulator.feature/.project b/edu.uah.rsesc.aadlsimulator.feature/.project index 9fd6e77bf..0f01ece84 100644 --- a/edu.uah.rsesc.aadlsimulator.feature/.project +++ b/edu.uah.rsesc.aadlsimulator.feature/.project @@ -10,11 +10,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -48,6 +43,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.FeatureNature diff --git a/edu.uah.rsesc.aadlsimulator.ui/.project b/edu.uah.rsesc.aadlsimulator.ui/.project index ca0327eb2..10df91887 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/.project +++ b/edu.uah.rsesc.aadlsimulator.ui/.project @@ -25,11 +25,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -68,6 +63,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature diff --git a/edu.uah.rsesc.aadlsimulator.xtext.ui/.project b/edu.uah.rsesc.aadlsimulator.xtext.ui/.project index 33c41938b..24ba70228 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext.ui/.project +++ b/edu.uah.rsesc.aadlsimulator.xtext.ui/.project @@ -30,11 +30,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -68,6 +63,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature diff --git a/edu.uah.rsesc.aadlsimulator.xtext/.project b/edu.uah.rsesc.aadlsimulator.xtext/.project index 29db5a755..67c8af4c1 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/.project +++ b/edu.uah.rsesc.aadlsimulator.xtext/.project @@ -30,11 +30,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -68,6 +63,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature diff --git a/edu.uah.rsesc.aadlsimulator/.project b/edu.uah.rsesc.aadlsimulator/.project index 077f86832..53af68a43 100644 --- a/edu.uah.rsesc.aadlsimulator/.project +++ b/edu.uah.rsesc.aadlsimulator/.project @@ -35,11 +35,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -73,6 +68,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature diff --git a/edu.uah.rsesc.agree.ge.ui/.project b/edu.uah.rsesc.agree.ge.ui/.project index c8a6169c8..809f37dd8 100644 --- a/edu.uah.rsesc.agree.ge.ui/.project +++ b/edu.uah.rsesc.agree.ge.ui/.project @@ -20,11 +20,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -63,6 +58,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature diff --git a/edu.uah.rsesc.agree.ge/.project b/edu.uah.rsesc.agree.ge/.project index 231551dd1..9ba059756 100644 --- a/edu.uah.rsesc.agree.ge/.project +++ b/edu.uah.rsesc.agree.ge/.project @@ -20,11 +20,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.oomph.version.VersionBuilder @@ -63,6 +58,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.pde.PluginNature From b80ea9da0b19f2e58190960b57d7734962498c44 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 1 Mar 2024 08:55:02 -0600 Subject: [PATCH 05/15] Adjust releng for pre-release analysis --- agree-releng/version-management/release.properties | 2 +- agree-releng/version-management/release.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agree-releng/version-management/release.properties b/agree-releng/version-management/release.properties index e806fc387..b7cd3560d 100644 --- a/agree-releng/version-management/release.properties +++ b/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 diff --git a/agree-releng/version-management/release.xml b/agree-releng/version-management/release.xml index 8d5119dfe..ce755e3f4 100644 --- a/agree-releng/version-management/release.xml +++ b/agree-releng/version-management/release.xml @@ -9,8 +9,8 @@ - - + + @@ -36,7 +36,7 @@ - + From a2f5b4508430a282722b4887c15bb8ddd8c2a06f Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 1 Mar 2024 08:56:36 -0600 Subject: [PATCH 06/15] Fix @since warning --- .../rockwellcollins/atc/agree/validation/AgreeValidator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/com.rockwellcollins.atc.agree/src/com/rockwellcollins/atc/agree/validation/AgreeValidator.java b/com.rockwellcollins.atc.agree/src/com/rockwellcollins/atc/agree/validation/AgreeValidator.java index 385375d1b..8406a566b 100644 --- a/com.rockwellcollins.atc.agree/src/com/rockwellcollins/atc/agree/validation/AgreeValidator.java +++ b/com.rockwellcollins.atc.agree/src/com/rockwellcollins/atc/agree/validation/AgreeValidator.java @@ -2250,6 +2250,9 @@ public static boolean isInLinearizationBody(Expr expr) { return result; } + /** + * @since 4.0 + */ public static boolean isInConstBody(Expr expr) { boolean result = false; EObject current = expr; From eacb721c9dae51fa9b659345b6393c9d9416c463 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 1 Mar 2024 08:57:13 -0600 Subject: [PATCH 07/15] Update dependencies and versions --- .../META-INF/MANIFEST.MF | 26 ++++++++--------- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- com.rockwellcollins.atc.agree.doc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- .../pom.xml | 2 +- .../feature.xml | 6 ++-- com.rockwellcollins.atc.agree.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 20 ++++++------- com.rockwellcollins.atc.agree.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 28 +++++++++---------- com.rockwellcollins.atc.agree/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- edu.uah.rsesc.aadlsimulator.doc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF | 2 +- 21 files changed, 59 insertions(+), 59 deletions(-) diff --git a/com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF index 76dde8697..823ccca8a 100644 --- a/com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.eclipse.ui;bundle-version="[3.119.0,4.0.0)", @@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,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;bundle-version="[3.0.0,4.0.0)", - com.rockwellcollins.atc.agree.ui;bundle-version="[3.1.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)", @@ -28,14 +28,14 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., lib/gson.jar Import-Package: org.apache.commons.lang;version="[2.6.0,3.0.0)" -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" +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 diff --git a/com.rockwellcollins.atc.agree.analysis/pom.xml b/com.rockwellcollins.atc.agree.analysis/pom.xml index d23a206bb..094d37eb8 100644 --- a/com.rockwellcollins.atc.agree.analysis/pom.xml +++ b/com.rockwellcollins.atc.agree.analysis/pom.xml @@ -27,7 +27,7 @@ 2.10.1-SNAPSHOT com.rockwellcollins.atc.agree.analysis - 2.10.1-SNAPSHOT + 2.10.2-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF index aeaec4501..492ed17c4 100644 --- a/com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ 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.8.0,3.0.0)", - com.rockwellcollins.atc.agree;bundle-version="[3.0.0,4.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)", diff --git a/com.rockwellcollins.atc.agree.doc/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.doc/META-INF/MANIFEST.MF index 340915385..0e2560860 100644 --- a/com.rockwellcollins.atc.agree.doc/META-INF/MANIFEST.MF +++ b/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)" diff --git a/com.rockwellcollins.atc.agree.doc/pom.xml b/com.rockwellcollins.atc.agree.doc/pom.xml index 891814c57..0104e5c78 100644 --- a/com.rockwellcollins.atc.agree.doc/pom.xml +++ b/com.rockwellcollins.atc.agree.doc/pom.xml @@ -27,7 +27,7 @@ 2.10.1-SNAPSHOT com.rockwellcollins.atc.agree.doc - 2.9.2-SNAPSHOT + 2.10.0-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.examples/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.examples/META-INF/MANIFEST.MF index d889a43cc..89b0cf784 100644 --- a/com.rockwellcollins.atc.agree.examples/META-INF/MANIFEST.MF +++ b/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 diff --git a/com.rockwellcollins.atc.agree.examples/pom.xml b/com.rockwellcollins.atc.agree.examples/pom.xml index f834822c9..fa03d98f0 100644 --- a/com.rockwellcollins.atc.agree.examples/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/pom.xml @@ -30,7 +30,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.examples - 1.0.3-SNAPSHOT + 1.0.2-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.feature/feature.xml b/com.rockwellcollins.atc.agree.feature/feature.xml index f94a93d02..48cac4a60 100644 --- a/com.rockwellcollins.atc.agree.feature/feature.xml +++ b/com.rockwellcollins.atc.agree.feature/feature.xml @@ -22,7 +22,7 @@ @@ -74,9 +74,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + - + diff --git a/com.rockwellcollins.atc.agree.feature/pom.xml b/com.rockwellcollins.atc.agree.feature/pom.xml index b7678bad8..2ce3fa9fa 100644 --- a/com.rockwellcollins.atc.agree.feature/pom.xml +++ b/com.rockwellcollins.atc.agree.feature/pom.xml @@ -28,6 +28,6 @@ com.rockwellcollins.atc.agree.feature eclipse-feature - 2.10.1-SNAPSHOT + 2.11.0-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree.tests/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.tests/META-INF/MANIFEST.MF index c868c37c1..ca2d43265 100644 --- a/com.rockwellcollins.atc.agree.tests/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.tests/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: com.google.guava, org.osate.xtext.aadl2;bundle-version="[7.0.0,8.0.0)", org.osate.xtext.aadl2.ui;bundle-version="[7.0.0,8.0.0)", org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)", - com.rockwellcollins.atc.agree, + com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", com.rockwellcollins.atc.agree.analysis;bundle-version="[2.4.0,3.0.0)", com.rockwellcollins.atc.agree.ui;bundle-version="2.4.0", org.eclipse.emf.mwe.utils;bundle-version="[1.5.0,2.0.0)", diff --git a/com.rockwellcollins.atc.agree.ui/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.ui/META-INF/MANIFEST.MF index 19023f396..0c38949fc 100644 --- a/com.rockwellcollins.atc.agree.ui/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.ui/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE front-end Bundle-Vendor: Rockwell Collins, Inc. -Bundle-Version: 3.2.1.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-SymbolicName: com.rockwellcollins.atc.agree.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: com.rockwellcollins.atc.agree;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, +Require-Bundle: com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="[2.25.0,3.0.0)", org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", @@ -28,13 +28,13 @@ Import-Package: org.apache.log4j;version="[1.1.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.25.0,3.0.0)", org.osate.ui.wizards Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: com.rockwellcollins.atc.agree.parsing;version="3.2.1", - com.rockwellcollins.atc.agree.ui.contentassist;version="3.2.1", - com.rockwellcollins.atc.agree.ui.internal;version="3.2.1", - com.rockwellcollins.atc.agree.ui.quickfix;version="3.2.1", - com.rockwellcollins.atc.agree.unparsing;version="3.2.1", - com.rockwellcollins.atc.agree.ide.contentassist.antlr.lexer;version="3.2.1", - com.rockwellcollins.atc.agree.ide.contentassist.antlr.internal;version="3.2.1", - com.rockwellcollins.atc.agree.ide.contentassist.antlr;version="3.2.1" +Export-Package: com.rockwellcollins.atc.agree.parsing;version="4.0.0", + com.rockwellcollins.atc.agree.ui.contentassist;version="4.0.0", + com.rockwellcollins.atc.agree.ui.internal;version="4.0.0", + com.rockwellcollins.atc.agree.ui.quickfix;version="4.0.0", + com.rockwellcollins.atc.agree.unparsing;version="4.0.0", + com.rockwellcollins.atc.agree.ide.contentassist.antlr.lexer;version="4.0.0", + com.rockwellcollins.atc.agree.ide.contentassist.antlr.internal;version="4.0.0", + com.rockwellcollins.atc.agree.ide.contentassist.antlr;version="4.0.0" Bundle-Activator: com.rockwellcollins.atc.agree.ui.internal.AgreeActivator Automatic-Module-Name: com.rockwellcollins.atc.agree.ui diff --git a/com.rockwellcollins.atc.agree.ui/pom.xml b/com.rockwellcollins.atc.agree.ui/pom.xml index 998ff8048..93bab637e 100644 --- a/com.rockwellcollins.atc.agree.ui/pom.xml +++ b/com.rockwellcollins.atc.agree.ui/pom.xml @@ -27,6 +27,6 @@ 2.10.1-SNAPSHOT com.rockwellcollins.atc.agree.ui - 3.2.1-SNAPSHOT + 4.0.0-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF index bb614890c..b235b5816 100644 --- a/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE back-end Bundle-Vendor: Rockwell Collins, Inc. -Bundle-Version: 3.1.1.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-SymbolicName: com.rockwellcollins.atc.agree; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="[2.25.0,3.0.0)";visibility:=reexport, @@ -24,17 +24,17 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.25.0,3.0.0)";visibility:=re org.eclipse.xtext.xbase.lib;bundle-version="[2.14.0,3.0.0)" Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: com.rockwellcollins.atc.agree;version="3.1.1", - com.rockwellcollins.atc.agree.services;version="3.1.1", - com.rockwellcollins.atc.agree.agree;version="3.1.1", - com.rockwellcollins.atc.agree.agree.impl;version="3.1.1", - com.rockwellcollins.atc.agree.agree.util;version="3.1.1", - com.rockwellcollins.atc.agree.parser.antlr;version="3.1.1", - com.rockwellcollins.atc.agree.parser.antlr.internal;version="3.1.1", - com.rockwellcollins.atc.agree.validation;version="3.1.1", - com.rockwellcollins.atc.agree.scoping;version="3.1.1", - com.rockwellcollins.atc.agree.formatting2;version="3.1.1", - com.rockwellcollins.atc.agree.linking;version="3.1.1", - com.rockwellcollins.atc.agree.serializer;version="3.1.1", - com.rockwellcollins.atc.agree.parser.antlr.lexer;version="3.1.1" +Export-Package: com.rockwellcollins.atc.agree;version="4.0.0", + com.rockwellcollins.atc.agree.services;version="4.0.0", + com.rockwellcollins.atc.agree.agree;version="4.0.0", + com.rockwellcollins.atc.agree.agree.impl;version="4.0.0", + com.rockwellcollins.atc.agree.agree.util;version="4.0.0", + com.rockwellcollins.atc.agree.parser.antlr;version="4.0.0", + com.rockwellcollins.atc.agree.parser.antlr.internal;version="4.0.0", + com.rockwellcollins.atc.agree.validation;version="4.0.0", + com.rockwellcollins.atc.agree.scoping;version="4.0.0", + com.rockwellcollins.atc.agree.formatting2;version="4.0.0", + com.rockwellcollins.atc.agree.linking;version="4.0.0", + com.rockwellcollins.atc.agree.serializer;version="4.0.0", + com.rockwellcollins.atc.agree.parser.antlr.lexer;version="4.0.0" Automatic-Module-Name: com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree/pom.xml b/com.rockwellcollins.atc.agree/pom.xml index b8cda7f97..66d247875 100644 --- a/com.rockwellcollins.atc.agree/pom.xml +++ b/com.rockwellcollins.atc.agree/pom.xml @@ -27,6 +27,6 @@ 2.10.1-SNAPSHOT com.rockwellcollins.atc.agree - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.tcg/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.tcg/META-INF/MANIFEST.MF index e14fb541f..97e5df13b 100644 --- a/com.rockwellcollins.atc.tcg/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.tcg/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.osate.aadl2.modelsupport;bundle-version="[7.0.0,8.0.0)", org.osate.ui;bundle-version="[6.0.0,7.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)", - com.rockwellcollins.atc.agree;bundle-version="[3.0.0,4.0.0)", + com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", com.rockwellcollins.atc.agree.analysis;bundle-version="[2.8.0,3.0.0)", org.osate.ge;bundle-version="[3.0.0,4.0.0)", com.collins.trustedsystems.jkindapi;bundle-version="[4.0.0,5.0.0)" diff --git a/edu.uah.rsesc.aadlsimulator.agree.ui/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.agree.ui/META-INF/MANIFEST.MF index 869006773..e6eb72266 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.ui/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.agree.ui/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: edu.uah.rsesc.aadlsimulator.ui;bundle-version="[2.8.0,3.0.0)", org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)", org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", org.eclipse.debug.core;bundle-version="[3.18.0,4.0.0)", - com.rockwellcollins.atc.agree;bundle-version="[3.0.0,4.0.0)", + com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", org.eclipse.debug.ui;bundle-version="[3.14.0,4.0.0)", com.rockwellcollins.atc.tcg;bundle-version="[2.8.0,3.0.0)", org.eclipse.xtext.ui;bundle-version="[2.25.0,3.0.0)", diff --git a/edu.uah.rsesc.aadlsimulator.agree/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.agree/META-INF/MANIFEST.MF index 2ab15cb9b..d31f2bce3 100644 --- a/edu.uah.rsesc.aadlsimulator.agree/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.agree/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator.agree;singleton:=true Bundle-Version: 2.9.1.qualifier 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;bundle-version="[3.0.0,4.0.0)", + com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", com.rockwellcollins.atc.agree.analysis;bundle-version="[2.8.0,3.0.0)", edu.uah.rsesc.aadlsimulator;bundle-version="[2.8.0,3.0.0)", diff --git a/edu.uah.rsesc.aadlsimulator.doc/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.doc/META-INF/MANIFEST.MF index 73086b473..48361b722 100644 --- a/edu.uah.rsesc.aadlsimulator.doc/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AADL Simulator Documentation Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator.doc;singleton:=true -Bundle-Version: 2.7.4.qualifier +Bundle-Version: 2.7.3.qualifier Bundle-Vendor: The University of Alabama in Huntsville 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)" diff --git a/edu.uah.rsesc.aadlsimulator.doc/pom.xml b/edu.uah.rsesc.aadlsimulator.doc/pom.xml index 357c3d28b..fb1203f4e 100644 --- a/edu.uah.rsesc.aadlsimulator.doc/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.doc/pom.xml @@ -27,7 +27,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.doc - 2.7.4-SNAPSHOT + 2.7.3-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.agree.ge.ui/META-INF/MANIFEST.MF b/edu.uah.rsesc.agree.ge.ui/META-INF/MANIFEST.MF index 2802dfd85..3ccff2e67 100644 --- a/edu.uah.rsesc.agree.ge.ui/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.agree.ge.ui/META-INF/MANIFEST.MF @@ -8,14 +8,14 @@ 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.eclipse.ui.views.properties.tabbed;bundle-version="[3.9.0,4.0.0)", org.eclipse.xtext.ui;bundle-version="[2.25.0,3.0.0)", - com.rockwellcollins.atc.agree;bundle-version="[3.0.0,4.0.0)", + com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", org.osate.ge;bundle-version="[3.0.0,4.0.0)", org.osate.aadl2.edit;bundle-version="[5.0.0,6.0.0)", org.osate.ui;bundle-version="[6.0.0,7.0.0)", org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)", edu.uah.rsesc.agree.ge;bundle-version="[2.8.0,3.0.0)", - com.rockwellcollins.atc.agree.ui;bundle-version="[3.1.0,4.0.0)", + com.rockwellcollins.atc.agree.ui;bundle-version="[4.0.0,5.0.0)", org.osate.xtext.aadl2.ui;bundle-version="[7.0.0,8.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF b/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF index e3bed6455..161c0ed59 100644 --- a/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: AGREE extensions to the OSATE Graphical Editor Bundle-SymbolicName: edu.uah.rsesc.agree.ge;singleton:=true Bundle-Version: 2.9.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", - com.rockwellcollins.atc.agree;bundle-version="[3.0.0,4.0.0)", + com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", org.osate.ge;bundle-version="[3.0.0,4.0.0)", org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)" From 30d0591212e393e0f80fc0f55913e79a2eb37bbc Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 1 Mar 2024 10:53:58 -0600 Subject: [PATCH 08/15] Add workflow_dispatch to build workflow for manual triggering --- .github/workflows/build_and_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 65e1b84c7..6ce25d86f 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -6,6 +6,7 @@ on: pull_request: branches: [ "master" ] types: [opened, reopened, edited] + workflow_dispatch: jobs: verify: @@ -22,4 +23,4 @@ jobs: - name: Install Dependencies run: sudo apt-get install -y pandoc - name: Compile and Test Maven Project - run: mvn clean verify \ No newline at end of file + run: mvn clean verify From 6c7cc8a1168fd1172e3d90a4bf316d6ba93de32b Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 1 Mar 2024 11:11:32 -0600 Subject: [PATCH 09/15] Update github actions workflows to avoid deprecated Node.js 16 --- .github/workflows/build_and_test.yml | 4 ++-- .github/workflows/build_maven.yml | 4 ++-- .github/workflows/release.yml | 10 +++++----- .github/workflows/snapshot.yml | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 6ce25d86f..d2a84f103 100644 --- a/.github/workflows/build_and_test.yml +++ b/.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' diff --git a/.github/workflows/build_maven.yml b/.github/workflows/build_maven.yml index f11baa515..9739123a8 100644 --- a/.github/workflows/build_maven.yml +++ b/.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' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 605e90c34..5fc65337c 100644 --- a/.github/workflows/release.yml +++ b/.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,9 +60,9 @@ 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' @@ -70,7 +70,7 @@ jobs: - 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 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 1c3c97226..169e8a47f 100644 --- a/.github/workflows/snapshot.yml +++ b/.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,9 +130,9 @@ 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' @@ -140,7 +140,7 @@ jobs: - 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 From a52c333deccff32e0eb7019c79207d26d379c759 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 1 Mar 2024 15:02:55 -0600 Subject: [PATCH 10/15] Update copyrights --- com.rockwellcollins.atc.agree.analysis/pom.xml | 2 +- com.rockwellcollins.atc.agree.doc/pom.xml | 2 +- com.rockwellcollins.atc.agree.examples/pom.xml | 2 +- com.rockwellcollins.atc.agree.feature/feature.xml | 6 +++--- com.rockwellcollins.atc.agree.feature/pom.xml | 2 +- com.rockwellcollins.atc.agree.ui/pom.xml | 2 +- com.rockwellcollins.atc.agree/pom.xml | 2 +- .../atc/agree/validation/AgreeValidator.java | 2 +- pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/com.rockwellcollins.atc.agree.analysis/pom.xml b/com.rockwellcollins.atc.agree.analysis/pom.xml index 094d37eb8..d584df643 100644 --- a/com.rockwellcollins.atc.agree.analysis/pom.xml +++ b/com.rockwellcollins.atc.agree.analysis/pom.xml @@ -1,6 +1,6 @@