Skip to content

Commit 911339c

Browse files
leviathan747leviathan747
authored
Merge pull request #868 from xtuml/7.6-release
7.6 release
2 parents 9bfcda3 + eee517d commit 911339c

File tree

224 files changed

+743
-734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+743
-734
lines changed

‎doc-bridgepoint/process/templates/launch_configs/BP Application (OSX).launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<booleanAttribute key="includeOptional" value="true"/>
1515
<stringAttribute key="location" value="${eclipse_home}/bp_tests/test_workspace"/>
1616
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
17-
<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"/>
17+
<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"/>
1818
<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"/>
1919
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
2020
<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"/>

‎doc-bridgepoint/process/templates/launch_configs/Model Compare Test (OSX).launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
2828
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
2929
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
30-
<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"/>
30+
<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"/>
3131
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.xtuml.bp.model.compare.test.ModelCompareTestSuite"/>
3232
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-pluginCustomization ${resource_loc:/org.xtuml.bp.core}/../org.xtuml.bp.pkg/plugin_customization.ini"/>
3333
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.xtuml.bp.model.compare.test"/>

‎releng/org.xtuml.bp.mctools.parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<packaging>pom</packaging>
99

1010
<properties>
11-
<tycho-version>2.7.4</tycho-version>
11+
<tycho-version>4.0.4</tycho-version>
1212
</properties>
1313

1414
<modules>

‎releng/org.xtuml.bp.releng.p2/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<groupId>org.xtuml.bp</groupId>
77
<artifactId>org.xtuml.bp.releng.parent</artifactId>
8-
<version>7.5.0-SNAPSHOT</version>
8+
<version>7.6.0-SNAPSHOT</version>
99
<relativePath>../../releng/org.xtuml.bp.releng.parent/</relativePath>
1010
</parent>
1111
<groupId>org.xtuml.bp</groupId>
1212
<artifactId>org.xtuml.bp.releng.p2</artifactId>
13-
<version>7.5.0-SNAPSHOT</version>
13+
<version>7.6.0-SNAPSHOT</version>
1414
<packaging>eclipse-repository</packaging>
1515
</project>

‎releng/org.xtuml.bp.releng.parent.generation/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<parent>
88
<groupId>org.xtuml.bp</groupId>
99
<artifactId>org.xtuml.bp.releng.parent</artifactId>
10-
<version>7.5.0-SNAPSHOT</version>
10+
<version>7.6.0-SNAPSHOT</version>
1111
<relativePath>../org.xtuml.bp.releng.parent/</relativePath>
1212
</parent>
1313

1414
<groupId>org.xtuml.bp</groupId>
1515
<artifactId>org.xtuml.bp.releng.parent.generation</artifactId>
16-
<version>7.5.0-SNAPSHOT</version>
16+
<version>7.6.0-SNAPSHOT</version>
1717
<packaging>pom</packaging>
1818

1919
<modules>

‎releng/org.xtuml.bp.releng.parent.product-dev/bridgepoint-dev.product

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<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">
4+
<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">
55

66

77
<configIni use="default">
88
</configIni>
99

1010
<launcherArgs>
1111
<vmArgs>-Dorg.eclipse.epp.logging.aeri.ui.skipReports=true
12-
-Dosgi.requiredJavaVersion=11
12+
-Dosgi.requiredJavaVersion=17
1313
-Xmx1024m
1414
-Xms512m
1515
</vmArgs>

‎releng/org.xtuml.bp.releng.parent.product-dev/p2.inf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
instructions.configure = \
2-
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.12.v20211102-1452/bin,targetFile:ant,permissions:755); \
3-
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.12.v20211102-1452/bin,targetFile:antRun,permissions:755);
2+
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:ant,permissions:755); \
3+
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:antRun,permissions:755);

‎releng/org.xtuml.bp.releng.parent.product-dev/pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>org.xtuml.bp</groupId>
77
<artifactId>org.xtuml.bp.releng.parent</artifactId>
8-
<version>7.5.0-SNAPSHOT</version>
8+
<version>7.6.0-SNAPSHOT</version>
99
<relativePath>../org.xtuml.bp.releng.parent/</relativePath>
1010
</parent>
1111
<groupId>org.xtuml.bp</groupId>
1212
<artifactId>org.xtuml.bp.releng.parent.product-dev</artifactId>
13-
<version>7.5.0-SNAPSHOT</version>
13+
<version>7.6.0-SNAPSHOT</version>
1414
<packaging>eclipse-repository</packaging>
1515

1616
<build>
@@ -66,6 +66,11 @@
6666
<rootFolder>BridgePoint</rootFolder>
6767
</product>
6868
</products>
69+
<formats>
70+
<linux>zip</linux>
71+
<macosx>zip</macosx>
72+
<win32>zip</win32>
73+
</formats>
6974
</configuration>
7075
</execution>
7176
</executions>

‎releng/org.xtuml.bp.releng.parent.product/bridgepoint.product

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<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">
4+
<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">
55

66

77
<configIni use="default">
@@ -10,7 +10,7 @@
1010
<launcherArgs>
1111
<vmArgs>-Dorg.eclipse.epp.logging.aeri.ui.skipReports=true
1212
-Dbridgepoint.GenerateFunctionsFromList=disabled
13-
-Dosgi.requiredJavaVersion=11
13+
-Dosgi.requiredJavaVersion=17
1414
-Xmx1024m
1515
-Xms512m
1616
</vmArgs>

‎releng/org.xtuml.bp.releng.parent.product/p2.inf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
instructions.configure = \
2-
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.12.v20211102-1452/bin,targetFile:ant,permissions:755); \
3-
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.12.v20211102-1452/bin,targetFile:antRun,permissions:755);
2+
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:ant,permissions:755); \
3+
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:antRun,permissions:755);

0 commit comments

Comments
 (0)