Skip to content

Commit

Permalink
Merge pull request #868 from xtuml/7.6-release
Browse files Browse the repository at this point in the history
7.6 release
  • Loading branch information
leviathan747 authored Mar 5, 2024
2 parents 9bfcda3 + eee517d commit 911339c
Show file tree
Hide file tree
Showing 224 changed files with 743 additions and 734 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${eclipse_home}/bp_tests/test_workspace"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -pluginCustomization ${workspace_loc}/org.xtuml.bp.pkg/plugin_customization.ini -nosplash"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms512m -Xmx1024m -Dfile.encoding=UTF-8 -Declipse.product=org.xtuml.bp.pkg.BridgePoint"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.xtuml.bp.model.compare.test.ModelCompareTestSuite"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-pluginCustomization ${resource_loc:/org.xtuml.bp.core}/../org.xtuml.bp.pkg/plugin_customization.ini"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.xtuml.bp.model.compare.test"/>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.xtuml.bp.mctools.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<packaging>pom</packaging>

<properties>
<tycho-version>2.7.4</tycho-version>
<tycho-version>4.0.4</tycho-version>
</properties>

<modules>
Expand Down
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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?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.5.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.6.0.qualifier" useFeatures="true" includeLaunchers="true">


<configIni use="default">
</configIni>

<launcherArgs>
<vmArgs>-Dorg.eclipse.epp.logging.aeri.ui.skipReports=true
-Dosgi.requiredJavaVersion=11
-Dosgi.requiredJavaVersion=17
-Xmx1024m
-Xms512m
</vmArgs>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.product-dev/p2.inf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
instructions.configure = \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.12.v20211102-1452/bin,targetFile:ant,permissions:755); \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.12.v20211102-1452/bin,targetFile:antRun,permissions:755);
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:ant,permissions:755); \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:antRun,permissions:755);
9 changes: 7 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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<build>
Expand Down Expand Up @@ -66,6 +66,11 @@
<rootFolder>BridgePoint</rootFolder>
</product>
</products>
<formats>
<linux>zip</linux>
<macosx>zip</macosx>
<win32>zip</win32>
</formats>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.product/bridgepoint.product
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.5.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.6.0.qualifier" useFeatures="true" includeLaunchers="true">


<configIni use="default">
Expand All @@ -10,7 +10,7 @@
<launcherArgs>
<vmArgs>-Dorg.eclipse.epp.logging.aeri.ui.skipReports=true
-Dbridgepoint.GenerateFunctionsFromList=disabled
-Dosgi.requiredJavaVersion=11
-Dosgi.requiredJavaVersion=17
-Xmx1024m
-Xms512m
</vmArgs>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.product/p2.inf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
instructions.configure = \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.12.v20211102-1452/bin,targetFile:ant,permissions:755); \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.12.v20211102-1452/bin,targetFile:antRun,permissions:755);
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:ant,permissions:755); \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:antRun,permissions:755);
9 changes: 7 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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<build>
Expand Down Expand Up @@ -75,6 +75,11 @@
<rootFolder>BridgePoint</rootFolder>
</product>
</products>
<formats>
<linux>zip</linux>
<macosx>zip</macosx>
<win32>zip</win32>
</formats>
</configuration>
</execution>
</executions>
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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
16 changes: 9 additions & 7 deletions releng/org.xtuml.bp.releng.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,29 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.xtuml.bp</groupId>
<artifactId>org.xtuml.bp.releng.parent</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<tycho-version>2.7.4</tycho-version>
<tycho-version>4.0.4</tycho-version>
<ant-home-path>${env.ANT_HOME}</ant-home-path>
<eclipse-home-path>${env.bp_install_dir}</eclipse-home-path>
<mcj_path>../../src/MC-Java</mcj_path>
<bp_test_path>../../../bptest</bp_test_path>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

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

Expand Down
14 changes: 7 additions & 7 deletions src/org.xtuml.bp.als.oal/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<classpathentry kind="output" path="bin"/>
</classpath>
4 changes: 2 additions & 2 deletions 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.5.0.qualifier
Bundle-Version: 7.6.0.qualifier
Bundle-ClassPath: oal.jar
Bundle-Activator: org.xtuml.bp.als.oal.OalPlugin
Bundle-Vendor: xtUML.org
Expand All @@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.antlr
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-BundleShape: dir
Automatic-Module-Name: org.xtuml.bp.als.oal
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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<build>
Expand Down
14 changes: 7 additions & 7 deletions src/org.xtuml.bp.cli/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<classpathentry kind="output" path="bin"/>
</classpath>
15 changes: 0 additions & 15 deletions src/org.xtuml.bp.cli/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 2 additions & 2 deletions 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.5.0.qualifier
Bundle-Version: 7.6.0.qualifier
Bundle-Activator: org.xtuml.bp.cli.Activator
Bundle-Vendor: xtUML.org
Require-Bundle: org.eclipse.core.runtime,
Expand Down Expand Up @@ -31,6 +31,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.xtuml.bp.mc,
org.apache.commons.io;bundle-version="2.2.0",
org.xtuml.bp.mc.java
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.xtuml.bp.cli
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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
Expand Down
14 changes: 7 additions & 7 deletions src/org.xtuml.bp.compare/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<classpathentry kind="output" path="bin"/>
</classpath>
4 changes: 2 additions & 2 deletions 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.5.0.qualifier
Bundle-Version: 7.6.0.qualifier
Bundle-ClassPath: compare.jar
Bundle-Activator: org.xtuml.bp.compare.ComparePlugin
Bundle-Vendor: xtUML.org
Expand All @@ -19,6 +19,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.xtuml.bp.io.core,
org.xtuml.bp.io.mdl
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-BundleShape: dir
Automatic-Module-Name: org.xtuml.bp.compare
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.5.0-SNAPSHOT</version>
<version>7.6.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.5.0-SNAPSHOT</version>
<version>7.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
Loading

0 comments on commit 911339c

Please sign in to comment.