Skip to content

Commit

Permalink
Merge pull request #843 from xtuml/12626/7.4-release
Browse files Browse the repository at this point in the history
12626/7.4 release
  • Loading branch information
leviathan747 committed Mar 16, 2023
2 parents bb3610d + 4c298ac commit a0384c8
Show file tree
Hide file tree
Showing 138 changed files with 2,229 additions and 1,614 deletions.
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pypy3
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.p2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../../releng/org.xtuml.bp.releng.parent/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.p2</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
</project>
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.generation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../org.xtuml.bp.releng.parent/</relativePath>
</parent>

<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent.generation</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="BridgePoint Dev" uid="org.xtuml.bp-dev.product" id="org.xtuml.bp.pkg.BridgePoint" application="org.eclipse.ui.ide.workbench" version="7.3.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="BridgePoint Dev" uid="org.xtuml.bp-dev.product" id="org.xtuml.bp.pkg.BridgePoint" application="org.eclipse.ui.ide.workbench" version="7.4.0.qualifier" useFeatures="true" includeLaunchers="true">


<configIni use="default">
Expand Down
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.product-dev/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../org.xtuml.bp.releng.parent/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent.product-dev</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="BridgePoint" uid="org.xtuml.bp.product" id="org.xtuml.bp.pkg.BridgePoint" application="org.eclipse.ui.ide.workbench" version="7.3.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="BridgePoint" uid="org.xtuml.bp.product" id="org.xtuml.bp.pkg.BridgePoint" application="org.eclipse.ui.ide.workbench" version="7.4.0.qualifier" useFeatures="true" includeLaunchers="true">


<configIni use="default">
Expand Down
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../org.xtuml.bp.releng.parent/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent.product</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<build>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../org.xtuml.bp.releng.parent/</relativePath>
</parent>

<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent.tests.super</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
12 changes: 6 additions & 6 deletions releng/org.xtuml.bp.releng.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand All @@ -20,12 +20,12 @@
<repository>
<id>2022-06</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2022-06/</url>
<url>https://download.eclipse.org/releases/2022-12/</url>
</repository>
<repository>
<id>4.24-update</id>
<id>4.26-update</id>
<layout>p2</layout>
<url>https://download.eclipse.org/eclipse/updates/4.24/</url>
<url>https://download.eclipse.org/eclipse/updates/4.26/</url>
</repository>
<repository>
<id>antlr</id>
Expand All @@ -34,9 +34,9 @@
<url>https://s3.amazonaws.com/1f-outgoing/antlr_upsite/</url>
</repository>
<repository>
<id>cdt-10.7.0</id>
<id>cdt-11.0.0</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/cdt/releases/10.7/</url>
<url>https://download.eclipse.org/tools/cdt/releases/11.0/</url>
</repository>
</repositories>

Expand Down
2 changes: 1 addition & 1 deletion src/org.xtuml.bp.als.oal/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BridgePoint Oal Plug-in
Bundle-SymbolicName: org.xtuml.bp.als.oal;singleton:=true
Bundle-Version: 7.3.0.qualifier
Bundle-Version: 7.4.0.qualifier
Bundle-ClassPath: oal.jar
Bundle-Activator: org.xtuml.bp.als.oal.OalPlugin
Bundle-Vendor: xtUML.org
Expand Down
4 changes: 2 additions & 2 deletions src/org.xtuml.bp.als.oal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../../releng/org.xtuml.bp.releng.parent/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.als.oal</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
4 changes: 2 additions & 2 deletions src/org.xtuml.bp.als/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../../releng/org.xtuml.bp.releng.parent/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.als</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion src/org.xtuml.bp.cli/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BridgePoint Command Line Interface
Bundle-SymbolicName: org.xtuml.bp.cli;singleton:=true
Bundle-Version: 7.3.0.qualifier
Bundle-Version: 7.4.0.qualifier
Bundle-Activator: org.xtuml.bp.cli.Activator
Bundle-Vendor: xtUML.org
Require-Bundle: org.eclipse.core.runtime,
Expand Down
4 changes: 2 additions & 2 deletions src/org.xtuml.bp.cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../../releng/org.xtuml.bp.releng.parent/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.cli</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
configurer.setShellStyle( SWT.NONE );
Point sizeZero = new Point(0, 0);
configurer.setInitialSize(sizeZero);
configurer.setShowFastViewBars(false);
configurer.setShowMenuBar(false);
configurer.setShowPerspectiveBar(false);
configurer.setShowCoolBar(false);
Expand All @@ -103,7 +102,6 @@ public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
ErrorDialog.AUTOMATED_MODE = true; // This should be what the --launcher.suppressErrors
// command-line option does. Setting it here also.
} else {
configurer.setShowFastViewBars(true);
configurer.setShowMenuBar(true);
configurer.setShowPerspectiveBar(true);
configurer.setShowCoolBar(true);
Expand Down
2 changes: 1 addition & 1 deletion src/org.xtuml.bp.compare/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BridgePoint Compare Plug-in
Bundle-SymbolicName: org.xtuml.bp.compare; singleton:=true
Bundle-Version: 7.3.0.qualifier
Bundle-Version: 7.4.0.qualifier
Bundle-ClassPath: compare.jar
Bundle-Activator: org.xtuml.bp.compare.ComparePlugin
Bundle-Vendor: xtUML.org
Expand Down
4 changes: 2 additions & 2 deletions src/org.xtuml.bp.compare/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent.generation</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../../releng/org.xtuml.bp.releng.parent.generation/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.compare</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion src/org.xtuml.bp.core.editors/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core Editors
Bundle-SymbolicName: org.xtuml.bp.core.editors;singleton:=true
Bundle-Version: 7.3.0.qualifier
Bundle-Version: 7.4.0.qualifier
Bundle-Activator: org.xtuml.bp.core.editors.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface.text,
Expand Down
4 changes: 2 additions & 2 deletions src/org.xtuml.bp.core.editors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../../releng/org.xtuml.bp.releng.parent/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.core.editors</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion src/org.xtuml.bp.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BridgePoint Core Plug-in
Bundle-SymbolicName: org.xtuml.bp.core; singleton:=true
Bundle-Version: 7.3.0.qualifier
Bundle-Version: 7.4.0.qualifier
Bundle-ClassPath: core.jar
Bundle-Activator: org.xtuml.bp.core.CorePlugin
Bundle-Vendor: xtUML.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,7 @@ attr.Root_Nam = id_attr.Name;

select one ref_attr related by attr->O_RATTR[R106];
relate ref_attr to base_attr across R113;
ref_attr.setDatatype();

if ( param.id != -1 )
select any assr_id related by self->O_ID[R104] where selected.Oid_ID == param.id;
Expand Down
4 changes: 2 additions & 2 deletions src/org.xtuml.bp.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent.generation</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../../releng/org.xtuml.bp.releng.parent.generation/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.core</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion src/org.xtuml.bp.debug.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BridgePoint Debug UI Plug-in
Bundle-SymbolicName: org.xtuml.bp.debug.ui; singleton:=true
Bundle-Version: 7.3.0.qualifier
Bundle-Version: 7.4.0.qualifier
Bundle-ClassPath: verifier.jar
Bundle-Activator: org.xtuml.bp.debug.ui.BPDebugUIPlugin
Bundle-Vendor: xtUML.org
Expand Down
4 changes: 2 additions & 2 deletions src/org.xtuml.bp.debug.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<relativePath>../../releng/org.xtuml.bp.releng.parent/</relativePath>
</parent>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.debug.ui</artifactId>
<version>7.3.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion src/org.xtuml.bp.doc/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BridgePoint Documentation Plug-in
Bundle-SymbolicName: org.xtuml.bp.doc; singleton:=true
Bundle-Version: 7.3.0.qualifier
Bundle-Version: 7.4.0.qualifier
Bundle-Vendor: xtUML.org
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Expand Down

0 comments on commit a0384c8

Please sign in to comment.