Skip to content

Commit 7ee98ac

Browse files
lwragelwrage
committed
Merge remote-tracking branch 'origin/master' into
2557_multiple_consecutive_keywords
2 parents 2bccd81 + 88cd1b3 commit 7ee98ac

File tree

326 files changed

+2580
-3735
lines changed

Some content is hidden

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

326 files changed

+2580
-3735
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
name: Report a Bug
3+
about: Report a problem with OSATE
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Summary**
11+
Briefly describe the problem, and what you're trying to accomplish. Screenshots or other files should be attached directly to this issue (see below). Don't attach binary files, such as Word documents, please.
12+
13+
**Expected behavior**
14+
A clear and concise description of what you expected to happen.
15+
16+
**Actual behavior**
17+
A clear and concise description of what is currently happening instead of the expected behavior.
18+
19+
**Steps To Reproduce**
20+
21+
- If you can provide a small model or test case that demonstrates the issue, it will be much easier to debug.
22+
- Paste small code snippets in the three ```backticks``` below, larger ones should be put in a [gist](gist.github.com)
23+
24+
1. Go to '...'
25+
2. Click on '....'
26+
3. Scroll down to '....'
27+
4. See error
28+
29+
```aadl
30+
Paste your model here
31+
```
32+
33+
**Screenshots**
34+
If applicable, add screenshots to help explain your problem.
35+
36+
**Desktop (please complete the following information):**
37+
- OSATE Version:
38+
- Operating System:
39+
40+
**Additional context**
41+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Ask a Question
4+
url: https://groups.google.com/g/osate
5+
about: Please ask and answer questions about OSATE or analysis plugins on the mailing list.

‎.github/ISSUE_TEMPLATE/feature-request.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: Request a Feature
3+
about: Suggest an improvement to OSATE
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Please describe the problem your proposed feature would address**
11+
A clear and concise description of what the problem is.
12+
Example:
13+
> I'm always frustrated when [...].
14+
15+
**What is the impact of the problem?**
16+
A clear and concise description of the impact of the problem.
17+
Example:
18+
> It takes me three times longer to [...] than it would if this feature were added.
19+
20+
**Describe the solution you'd like**
21+
A clear and concise description of what feature(s) should be added.
22+
23+
**Describe alternatives you've considered**
24+
A clear and concise description of any alternative solutions or features you've considered.
25+
26+
**Additional context**
27+
Add any other context or screenshots about the feature request here.

‎.github/issue_template.md‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1 @@
1-
<!--
2-
If you want to ask a question or if you are not sure if there
3-
really is a bug in OSATE, post on the google group first, please.
4-
https://groups.google.com/forum/#!forum/osate
5-
-->
6-
<!--
7-
Use regular sentence capitalization in issue title and use the
8-
preview tab to check the bug report before submitting it, please.
9-
-->
10-
## Summary
11-
<!---
12-
Briefly describe the problem, and what you're trying to accomplish.
13-
Screenshots or other files should be attached directly to this issue.
14-
Don't attach binary files, such as Word documents, please.
15-
-->
16-
17-
## Expected and Current Behavior
18-
<!---
19-
What should be happening, but isn't? What is happening instead?
20-
-->
21-
22-
## Steps to Reproduce
23-
<!---
24-
If you can provide a small model or test case that demonstrates the issue, it will be much easier to debug.
25-
Paste small code snippets in the three ```backticks``` below, larger ones should be put in a [gist](gist.github.com)
26-
-->
27-
28-
1.
29-
2.
30-
3.
31-
32-
```aadl
33-
Paste your model here
34-
```
35-
36-
## Environment
37-
38-
* **OSATE Version**:
39-
* **Operating System**: <!-- Windows / Mac / Linux and version number -->
1+
<!-- Please do not use this template to report a bug or request a new feature; rather, use the dedicated templates for that. Similarly, ask any questions about OSATE or its analysis plugins on the mailing list at https://groups.google.com/g/osate -->

‎alisa/org.osate.alisa.common.ui/.settings/.api_filters‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<component id="org.osate.alisa.common.ui" version="2">
3+
<resource path="META-INF/MANIFEST.MF">
4+
<filter comment="Xtext generated code" id="923795461">
5+
<message_arguments>
6+
<message_argument value="3.0.1"/>
7+
<message_argument value="3.0.0"/>
8+
</message_arguments>
9+
</filter>
10+
</resource>
11+
<resource path="META-INF/MANIFEST.MF" type="org.osate.alisa.common.scoping.AbstractCommonScopeProvider">
12+
<filter comment="Xtext generated code" id="305426566">
13+
<message_arguments>
14+
<message_argument value="org.osate.alisa.common.scoping.AbstractCommonScopeProvider"/>
15+
<message_argument value="org.osate.alisa.common.ui_3.0.0"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
</component>

‎alisa/org.osate.alisa.common.ui/META-INF/MANIFEST.MF‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Alisa Common UI
44
Bundle-Vendor: CMU/SEI
5-
Bundle-Version: 3.0.1.qualifier
5+
Bundle-Version: 3.0.2.qualifier
66
Bundle-SymbolicName: org.osate.alisa.common.ui; singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: org.osate.alisa.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
@@ -17,11 +17,11 @@ Require-Bundle: org.osate.alisa.common;bundle-version="[3.0.0,4.0.0)";visibility
1717
org.eclipse.compare;bundle-version="[3.7.0,4.0.0)",
1818
org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
1919
org.osate.aadl2.instantiation;bundle-version="[1.1.0,2.0.0)",
20-
org.osate.pluginsupport;bundle-version="[6.0.0,7.0.0)",
21-
org.osate.xtext.aadl2;bundle-version="[6.0.0,7.0.0)",
20+
org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)",
21+
org.osate.xtext.aadl2;bundle-version="[7.0.0,8.0.0)",
2222
org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
2323
org.osate.reqspec;bundle-version="[3.0.0,4.0.0)",
24-
org.osate.xtext.aadl2.ui;bundle-version="[6.0.0,7.0.0)",
24+
org.osate.xtext.aadl2.ui;bundle-version="[7.0.0,8.0.0)",
2525
org.eclipse.xtend.lib;bundle-version="[2.20.0,3.0.0)";resolution:=optional
2626
Import-Package: org.eclipse.xsemantics.runtime,
2727
org.apache.log4j;version="[1.2.0,2.0.0)"

‎alisa/org.osate.alisa.common.ui/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>org.osate</groupId>
99
<artifactId>alisa.parent</artifactId>
10-
<version>2.9.1-SNAPSHOT</version>
10+
<version>2.9.2-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>org.osate</groupId>
1414
<artifactId>org.osate.alisa.common.ui</artifactId>
15-
<version>3.0.1-SNAPSHOT</version>
15+
<version>3.0.2-SNAPSHOT</version>
1616
<packaging>eclipse-plugin</packaging>
1717

1818
</project>

‎alisa/org.osate.alisa.common/.settings/.api_filters‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<component id="org.osate.alisa.common" version="2">
3+
<resource path="src-gen/org/osate/alisa/common/scoping/AbstractCommonScopeProvider.java" type="org.osate.alisa.common.scoping.AbstractCommonScopeProvider">
4+
<filter comment="Xtext generated code" id="305365105">
5+
<message_arguments>
6+
<message_argument value="org.osate.alisa.common.scoping.AbstractCommonScopeProvider"/>
7+
<message_argument value="org.osate.alisa.common_3.0.1"/>
8+
</message_arguments>
9+
</filter>
10+
</resource>
311
<resource path="src-gen/org/osate/alisa/common/serializer/CommonSemanticSequencer.java" type="org.osate.alisa.common.serializer.CommonSemanticSequencer">
412
<filter comment="xtext" id="576720909">
513
<message_arguments>

‎alisa/org.osate.alisa.common/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Alisa Common
44
Bundle-Vendor: CMU/SEI
5-
Bundle-Version: 3.0.1.qualifier
5+
Bundle-Version: 3.0.2.qualifier
66
Bundle-SymbolicName: org.osate.alisa.common; singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=reexport,
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
2626
org.eclipse.xsemantics.runtime;bundle-version="[1.19.0,2.0.0)",
2727
org.osate.results;bundle-version="[2.0.0,3.0.0)",
2828
org.osate.aadl2.modelsupport;bundle-version="[6.0.0,7.0.0)",
29-
org.osate.pluginsupport;bundle-version="[6.0.0,7.0.0)"
29+
org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)"
3030
Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
3131
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
3232
Export-Package: org.osate.alisa.common,

‎alisa/org.osate.alisa.common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>org.osate</groupId>
99
<artifactId>alisa.parent</artifactId>
10-
<version>2.9.1-SNAPSHOT</version>
10+
<version>2.9.2-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>org.osate</groupId>
1414
<artifactId>org.osate.alisa.common</artifactId>
15-
<version>3.0.1-SNAPSHOT</version>
15+
<version>3.0.2-SNAPSHOT</version>
1616
<packaging>eclipse-plugin</packaging>
1717

1818
<build>

0 commit comments

Comments
 (0)