diff options
204 files changed, 2723 insertions, 759 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..b097564d5 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,93 @@ +# Community Code of Conduct + +**Version 2.0 +January 1, 2023** + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as community members, contributors, Committers[^1], and Project Leads (collectively "Contributors") pledge to make participation in our projects and our community a harassment-free and inclusive experience for everyone. + +This Community Code of Conduct ("Code") outlines our behavior expectations as members of our community in all Eclipse Foundation activities, both offline and online. It is not intended to govern scenarios or behaviors outside of the scope of Eclipse Foundation activities. Nor is it intended to replace or supersede the protections offered to all our community members under the law. Please follow both the spirit and letter of this Code and encourage other Contributors to follow these principles into our work. Failure to read or acknowledge this Code does not excuse a Contributor from compliance with the Code. + +## Our Standards + +Examples of behavior that contribute to creating a positive and professional environment include: + +- Using welcoming and inclusive language; +- Actively encouraging all voices; +- Helping others bring their perspectives and listening actively. If you find yourself dominating a discussion, it is especially important to encourage other voices to join in; +- Being respectful of differing viewpoints and experiences; +- Gracefully accepting constructive criticism; +- Focusing on what is best for the community; +- Showing empathy towards other community members; +- Being direct but professional; and +- Leading by example by holding yourself and others accountable + +Examples of unacceptable behavior by Contributors include: + +- The use of sexualized language or imagery; +- Unwelcome sexual attention or advances; +- Trolling, insulting/derogatory comments, and personal or political attacks; +- Public or private harassment, repeated harassment; +- Publishing others' private information, such as a physical or electronic address, without explicit permission; +- Violent threats or language directed against another person; +- Sexist, racist, or otherwise discriminatory jokes and language; +- Posting sexually explicit or violent material; +- Sharing private content, such as emails sent privately or non-publicly, or unlogged forums such as IRC channel history; +- Personal insults, especially those using racist or sexist terms; +- Excessive or unnecessary profanity; +- Advocating for, or encouraging, any of the above behavior; and +- Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +With the support of the Eclipse Foundation employees, consultants, officers, and directors (collectively, the "Staff"), Committers, and Project Leads, the Eclipse Foundation Conduct Committee (the "Conduct Committee") is responsible for clarifying the standards of acceptable behavior. The Conduct Committee takes appropriate and fair corrective action in response to any instances of unacceptable behavior. + +## Scope + +This Code applies within all Project, Working Group, and Interest Group spaces and communication channels of the Eclipse Foundation (collectively, "Eclipse spaces"), within any Eclipse-organized event or meeting, and in public spaces when an individual is representing an Eclipse Foundation Project, Working Group, Interest Group, or their communities. Examples of representing a Project or community include posting via an official social media account, personal accounts, or acting as an appointed representative at an online or offline event. Representation of Projects, Working Groups, and Interest Groups may be further defined and clarified by Committers, Project Leads, or the Staff. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Conduct Committee via conduct@eclipse-foundation.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Without the explicit consent of the reporter, the Conduct Committee is obligated to maintain confidentiality with regard to the reporter of an incident. The Conduct Committee is further obligated to ensure that the respondent is provided with sufficient information about the complaint to reply. If such details cannot be provided while maintaining confidentiality, the Conduct Committee will take the respondent‘s inability to provide a defense into account in its deliberations and decisions. Further details of enforcement guidelines may be posted separately. + +Staff, Committers and Project Leads have the right to report, remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code, or to block temporarily or permanently any Contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. Any such actions will be reported to the Conduct Committee for transparency and record keeping. + +Any Staff (including officers and directors of the Eclipse Foundation), Committers, Project Leads, or Conduct Committee members who are the subject of a complaint to the Conduct Committee will be recused from the process of resolving any such complaint. + +## Responsibility + +The responsibility for administering this Code rests with the Conduct Committee, with oversight by the Executive Director and the Board of Directors. For additional information on the Conduct Committee and its process, please write to <conduct@eclipse-foundation.org>. + +## Investigation of Potential Code Violations + +All conflict is not bad as a healthy debate may sometimes be necessary to push us to do our best. It is, however, unacceptable to be disrespectful or offensive, or violate this Code. If you see someone engaging in objectionable behavior violating this Code, we encourage you to address the behavior directly with those involved. If for some reason, you are unable to resolve the matter or feel uncomfortable doing so, or if the behavior is threatening or harassing, please report it following the procedure laid out below. + +Reports should be directed to <conduct@eclipse-foundation.org>. It is the Conduct Committee’s role to receive and address reported violations of this Code and to ensure a fair and speedy resolution. + +The Eclipse Foundation takes all reports of potential Code violations seriously and is committed to confidentiality and a full investigation of all allegations. The identity of the reporter will be omitted from the details of the report supplied to the accused. Contributors who are being investigated for a potential Code violation will have an opportunity to be heard prior to any final determination. Those found to have violated the Code can seek reconsideration of the violation and disciplinary action decisions. Every effort will be made to have all matters disposed of within 60 days of the receipt of the complaint. + +## Actions +Contributors who do not follow this Code in good faith may face temporary or permanent repercussions as determined by the Conduct Committee. + +This Code does not address all conduct. It works in conjunction with our [Communication Channel Guidelines](https://www.eclipse.org/org/documents/communication-channel-guidelines/), [Social Media Guidelines](https://www.eclipse.org/org/documents/social_media_guidelines.php), [Bylaws](https://www.eclipse.org/org/documents/eclipse-foundation-be-bylaws-en.pdf), and [Internal Rules](https://www.eclipse.org/org/documents/ef-be-internal-rules.pdf) which set out additional protections for, and obligations of, all contributors. The Foundation has additional policies that provide further guidance on other matters. + +It’s impossible to spell out every possible scenario that might be deemed a violation of this Code. Instead, we rely on one another’s good judgment to uphold a high standard of integrity within all Eclipse Spaces. Sometimes, identifying the right thing to do isn’t an easy call. In such a scenario, raise the issue as early as possible. + +## No Retaliation + +The Eclipse community relies upon and values the help of Contributors who identify potential problems that may need to be addressed within an Eclipse Space. Any retaliation against a Contributor who raises an issue honestly is a violation of this Code. That a Contributor has raised a concern honestly or participated in an investigation, cannot be the basis for any adverse action, including threats, harassment, or discrimination. If you work with someone who has raised a concern or provided information in an investigation, you should continue to treat the person with courtesy and respect. If you believe someone has retaliated against you, report the matter as described by this Code. Honest reporting does not mean that you have to be right when you raise a concern; you just have to believe that the information you are providing is accurate. + +False reporting, especially when intended to retaliate or exclude, is itself a violation of this Code and will not be accepted or tolerated. + +Everyone is encouraged to ask questions about this Code. Your feedback is welcome, and you will get a response within three business days. Write to <conduct@eclipse-foundation.org>. + +## Amendments + +The Eclipse Foundation Board of Directors may amend this Code from time to time and may vary the procedures it sets out where appropriate in a particular case. + +### Attribution + +This Code was inspired by the [Contributor Covenant](https://www.contributor-covenant.org/), version 1.4, available [here](https://www.contributor-covenant.org/version/1/4/code-of-conduct/). + +[^1]: Capitalized terms used herein without definition shall have the meanings assigned to them in the Bylaws. diff --git a/CONTRIBUTING b/CONTRIBUTING index 290097c9a..45f673716 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -1,67 +1,73 @@ -# Contributing to Eclipse MoDisco
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse MoDisco provides an extensible framework to elaborate on model-driven
-solutions supporting software reverse engineering and modernization use cases
-such as technical migration, software improvement, documentation generation,
-quality insurance, etc. Legacy systems embrace a large number of technologies,
-making the development of tools to cope with legacy systems evolution a tedious
-and time consuming task. As modernization projects face with both technologies
-combination and various modernization situations, model-driven approaches and
-tools offer the requisite abstraction level to build up mature and flexible
-modernization solutions. Quality Assurance: verifying whether an existing system
-meets the required qualities (detection of anti-patterns in existing code and
-computation of metrics.) Documentation: extraction of information from an
-existing system to help understanding one aspect of this system (structure,
-behaviour, persistence, data-flow, change impact , etc). Improvement:
-transformation of an existing system to integrate better coding norms or design
-patterns. Migration: transformation of an existing system to change a component,
-the framework, the language, or its architecture more about MoDisco »
-
-* https://projects.eclipse.org/projects/modeling.mdt.modisco
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/modeling.mdt.modisco/developer
-
-The project maintains the following source code repositories
-
-* http://git.eclipse.org/c/modisco/org.eclipse.modisco.git
-
-This project uses Bugzilla to track ongoing development and issues.
-
-* Search for issues:
- https://bugs.eclipse.org/bugs/buglist.cgi?product=MDT.MoDisco
-* Create a new report:
- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=MDT.MoDisco
-
-Be sure to search for existing bugs before you create another one. Remember that
-contributions are always welcome!
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://dev.eclipse.org/mailman/listinfo/modisco-dev
\ No newline at end of file +# Contributing to Eclipse MoDisco + +Thanks for your interest in this project. + +## Project description + +Eclipse MoDisco provides an extensible framework to elaborate on model-driven +solutions supporting software reverse engineering and modernization use cases +such as technical migration, software improvement, documentation generation, +quality insurance, etc. Legacy systems embrace a large number of technologies, +making the development of tools to cope with legacy systems evolution a tedious +and time consuming task. As modernization projects face with both technologies +combination and various modernization situations, model-driven approaches and +tools offer the requisite abstraction level to build up mature and flexible +modernization solutions. Quality Assurance: verifying whether an existing system +meets the required qualities (detection of anti-patterns in existing code and +computation of metrics.) Documentation: extraction of information from an +existing system to help understanding one aspect of this system (structure, +behaviour, persistence, data-flow, change impact , etc). Improvement: +transformation of an existing system to integrate better coding norms or design +patterns. Migration: transformation of an existing system to change a component, +the framework, the language, or its architecture  more about MoDisco »   + +* https://projects.eclipse.org/projects/modeling.modisco + +## Terms of Use + +This repository is subject to the Terms of Use of the Eclipse Foundation + +* https://www.eclipse.org/legal/termsofuse.php + +## Developer resources + +Information regarding source code management, builds, coding standards, and +more. + +* https://projects.eclipse.org/projects/modeling.modisco/developer + +The project maintains the following source code repositories + +* https://git.eclipse.org/r/modisco/org.eclipse.modisco +* https://github.com/eclipse/modisco-website + +## Eclipse Development Process + +This Eclipse Foundation open project is governed by the Eclipse Foundation +Development Process and operates under the terms of the Eclipse IP Policy. + +* https://eclipse.org/projects/dev_process +* https://www.eclipse.org/org/documents/Eclipse_IP_Policy.pdf + +## Eclipse Contributor Agreement + +In order to be able to contribute to Eclipse Foundation projects you must +electronically sign the Eclipse Contributor Agreement (ECA). + +* https://www.eclipse.org/legal/ECA.php + +The ECA provides the Eclipse Foundation with a permanent record that you agree +that each of your contributions will comply with the commitments documented in +the Developer Certificate of Origin (DCO). Having an ECA on file associated with +the email address matching the "Author" field of your contribution's Git commits +fulfills the DCO's requirement that you sign-off on your contributions. + +For more information, please see the Eclipse Committer Handbook: +https://www.eclipse.org/projects/handbook/#resources-commit + +## Contact + +Contact the project developers via the project's "dev" list. + +* https://dev.eclipse.org/mailman/listinfo/modisco-dev + @@ -2,11 +2,11 @@ This content is produced and maintained by the Eclipse MoDisco project.
-* Project home: https://projects.eclipse.org/projects/modeling.mdt.modisco
+* Project home: https://projects.eclipse.org/projects/modeling.modisco
## Trademarks
- Eclipse MoDisco is a trademark of the Eclipse Foundation.
+Eclipse MoDiscoâ„¢ is a trademark of the Eclipse Foundation.
## Copyright
@@ -18,7 +18,7 @@ source code repository logs. This program and the accompanying materials are made available under the terms
of the Eclipse Public License v. 2.0 which is available at
-http://www.eclipse.org/legal/epl-2.0.
+https://www.eclipse.org/legal/epl-2.0.
SPDX-License-Identifier: EPL-2.0
@@ -26,7 +26,8 @@ SPDX-License-Identifier: EPL-2.0 The project maintains the following source code repositories:
-* http://git.eclipse.org/c/modisco/org.eclipse.modisco.git
+* https://git.eclipse.org/r/modisco/org.eclipse.modisco
+* https://github.com/eclipse/modisco-website
## Third-party Content
@@ -83,4 +84,4 @@ may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software,
please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is
-permitted.
+permitted.
\ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..13cc52f0e --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,22 @@ +# Security Policy + +This project implements the Eclipse Foundation Security Policy + +* https://www.eclipse.org/security + +## Supported Versions + +These versions of Eclipse MoDisco are currently being supported with security +updates. + +| Version | Released | Supported | +| ----------------- | ---------- | --------- | +| 2023-12 (1.5.3) | 2023-12-06 | Yes | +| 2021-12 (1.5.2) | 2021-12-08 | Yes | +| < 2020-03 (1.5.1) | 2020-03-18 | No | + +## Reporting a Vulnerability + +Please report vulnerabilities to the Eclipse Foundation Security Team at +security@eclipse.org + diff --git a/org.eclipse.modisco.all.feature/feature.xml b/org.eclipse.modisco.all.feature/feature.xml index 2db6809cc..3e006646a 100644 --- a/org.eclipse.modisco.all.feature/feature.xml +++ b/org.eclipse.modisco.all.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.all.feature"
label="MoDisco's quality analysis reports"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.common.tests/pom.xml b/org.eclipse.modisco.common.tests/pom.xml index 0be745244..44fb06634 100644 --- a/org.eclipse.modisco.common.tests/pom.xml +++ b/org.eclipse.modisco.common.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.eclipse.feature/feature.xml b/org.eclipse.modisco.eclipse.feature/feature.xml index dda1e245f..4c8ee55e6 100644 --- a/org.eclipse.modisco.eclipse.feature/feature.xml +++ b/org.eclipse.modisco.eclipse.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.eclipse.feature"
label="%featureName"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.eclipseplugin"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.examples.feature/feature.xml b/org.eclipse.modisco.examples.feature/feature.xml index 616f3feb2..451684253 100644 --- a/org.eclipse.modisco.examples.feature/feature.xml +++ b/org.eclipse.modisco.examples.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.examples.feature"
label="MoDisco Examples"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.examples"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.facet.efacet.ui/.classpath b/org.eclipse.modisco.facet.efacet.ui/.classpath index a0c6dd9ce..ca3785c41 100644 --- a/org.eclipse.modisco.facet.efacet.ui/.classpath +++ b/org.eclipse.modisco.facet.efacet.ui/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <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>
diff --git a/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs index 95dbde4c4..11265a345 100644 --- a/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
\ No newline at end of file +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.facet.efacet.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.facet.efacet.ui/META-INF/MANIFEST.MF index 57639c2b5..fc5844b6c 100644 --- a/org.eclipse.modisco.facet.efacet.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.facet.efacet.ui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.modisco.facet.util.pde.core;bundle-version="0.4.0", org.eclipse.swt;bundle-version="3.6.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.modisco.facet.efacet.ui, org.eclipse.modisco.facet.efacet.ui.internal.composites;x-friends:="org.eclipse.modisco.facet.query.java.ui", diff --git a/org.eclipse.modisco.facet.feature/feature.xml b/org.eclipse.modisco.facet.feature/feature.xml index 98596627d..a97626e69 100644 --- a/org.eclipse.modisco.facet.feature/feature.xml +++ b/org.eclipse.modisco.facet.feature/feature.xml @@ -15,7 +15,7 @@ <feature
id="org.eclipse.modisco.facet.feature"
label="%featureName"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.facet.common.core"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.facet.util.emf.ui/.classpath b/org.eclipse.modisco.facet.util.emf.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.facet.util.emf.ui/.classpath +++ b/org.eclipse.modisco.facet.util.emf.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.facet.util.emf.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.facet.util.emf.ui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..bd1095bb3 --- /dev/null +++ b/org.eclipse.modisco.facet.util.emf.ui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.facet.util.emf.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.facet.util.emf.ui/META-INF/MANIFEST.MF index d5c3e9905..156d97d93 100644 --- a/org.eclipse.modisco.facet.util.emf.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.facet.util.emf.ui/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.modisco.facet.util.core;bundle-version="0.1.0", org.eclipse.modisco.facet.util.ui;bundle-version="0.3.0", org.eclipse.modisco.facet.util.swt;bundle-version="0.4.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.modisco.facet.util.emf.ui.internal.dialogs;x-friends:="org.eclipse.modisco.facet.widgets.celleditors", diff --git a/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.core.prefs index 060c5ee3d..e2812ca2b 100644 --- a/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,12 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.modisco.facet.util.swt/META-INF/MANIFEST.MF b/org.eclipse.modisco.facet.util.swt/META-INF/MANIFEST.MF index 6216b0b7f..682e8c995 100644 --- a/org.eclipse.modisco.facet.util.swt/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.facet.util.swt/META-INF/MANIFEST.MF @@ -13,11 +13,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.modisco.facet.util.swt.colorprovider,
org.eclipse.modisco.facet.util.swt.fontprovider,
- org.eclipse.modisco.facet.util.swt.imageprovider,
- org.eclipse.modisco.facet.util.swt.internal.exported;
- x-friends:="org.eclipse.modisco.facet.aggregate.tests,
- org.eclipse.modisco.facet.efacet.tests,
- org.eclipse.modisco.facet.custom.tests,
- org.eclipse.modisco.facet.widgets.table.tests,
- org.eclipse.modisco.facet.util.emf.ui.tests"
+ org.eclipse.modisco.facet.util.swt.imageprovider
Automatic-Module-Name: org.eclipse.modisco.facet.util.swt
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java b/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java deleted file mode 100644 index 6ed0f84a4..000000000 --- a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java +++ /dev/null @@ -1,65 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2012, 2019 CEA LIST, and Mia-Software and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * Nicolas Bros (Mia-Software) - Bug 372865 - FacetSet selection dialog
- * Grégoire Dupé (Mia-Software) - Bug 470191 - [Unit Test Failure] org.eclipse.modisco.facet.aggregate.tests.internal.CustomizationsCatalogViewTests.testCustomizationsView
- *******************************************************************************/ -package org.eclipse.modisco.facet.util.swt.internal.exported; - -import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
- -public final class SWTTestUtils { - private SWTTestUtils() { - // utility class - } - - /** - * Find a tree item with the given text among the list of tree items. - * - * @param text - * the text of the tree item to find - * @param items - * the list of tree items to search - * @return the tree item or <code>null</code> if not found - */ - public static TreeItem findTreeItem(final String text, final TreeItem[] items) { - TreeItem result = null; - for (TreeItem item : items) { - if (text.equals(item.getText())) { - result = item; - } - } - return result; - }
-
- public static TreeItem findRootTreeItem(final String text, final Tree tree) {
- TreeItem result = null;
- int nbItems = tree.getItemCount();
- for (int i = 0; i < nbItems; i++) {
- final TreeItem treeItem = tree.getItem(i);
- final String itemText = treeItem.getText();
- if (text.equals(itemText)) {
- result = treeItem;
- break;
- }
- }
- return result;
- }
-
- public static String itemsStr(final TreeItem[] items) {
- final StringBuffer strBuffer = new StringBuffer();
- for (TreeItem item : items) {
- if (strBuffer.length() > 0) {
- strBuffer.append(", "); //$NON-NLS-1$
- }
- strBuffer.append(item.getText());
- }
- return strBuffer.toString();
- } -} diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/TestUtils.java b/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/TestUtils.java deleted file mode 100644 index 4d10324ae..000000000 --- a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/TestUtils.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012, 2019 Mia-Software and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v2.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * Contributors: - * Nicolas Bros (Mia-Software) - Bug 378475 - unit test failures after table refactoring - *******************************************************************************/ -package org.eclipse.modisco.facet.util.swt.internal.exported; - -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.IntroPart; - -public final class TestUtils { - - private TestUtils() { - // utility class - } - - public static void closeWelcomePage() { - Display.getDefault().syncExec(new Runnable() { - public void run() { - IWorkbenchPart activePart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart(); - if (activePart != null) { - IntroPart adapter = (IntroPart) activePart.getAdapter(IntroPart.class); - if (adapter != null) { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().hideView((IViewPart) activePart); - } - } - } - }); - } - - public static void closeAllEditors() { - Display.getDefault().syncExec(new Runnable() { - public void run() { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); - } - }); - } -} diff --git a/org.eclipse.modisco.facet.util.tests.swtbot/.classpath b/org.eclipse.modisco.facet.util.tests.swtbot/.classpath index ef24cedc5..b862a296d 100644 --- a/org.eclipse.modisco.facet.util.tests.swtbot/.classpath +++ b/org.eclipse.modisco.facet.util.tests.swtbot/.classpath @@ -2,10 +2,6 @@ <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src">
- <!--attributes>
- <attribute name="test" value="true"/>
- </attributes-->
- </classpathentry>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.facet.util.tests.swtbot/META-INF/MANIFEST.MF b/org.eclipse.modisco.facet.util.tests.swtbot/META-INF/MANIFEST.MF index 1d178c4a4..8ad61eb1b 100644 --- a/org.eclipse.modisco.facet.util.tests.swtbot/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.facet.util.tests.swtbot/META-INF/MANIFEST.MF @@ -2,16 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: MoDisco Facet Util for SwtBot Bundle-SymbolicName: org.eclipse.modisco.facet.util.tests.swtbot -Bundle-Version: 1.5.0.qualifier +Bundle-Version: 1.5.3.qualifier Bundle-Activator: org.eclipse.modisco.facet.util.tests.swtbot.internal.Activator Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.4", org.hamcrest;bundle-version="1.1.0", - org.apache.log4j;bundle-version="1.2.13", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.modisco.facet.util.core;bundle-version="0.2.0" +Import-Package: org.apache.log4j;version="[1.2.15,2.0.0)", + org.slf4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.facet.util.tests.swtbot.internal; diff --git a/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/SWTBotUtils.java b/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/SWTBotUtils.java index 5fb5a1cb3..32937292f 100644 --- a/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/SWTBotUtils.java +++ b/org.eclipse.modisco.facet.util.tests.swtbot/src/org/eclipse/modisco/facet/util/tests/swtbot/internal/exported/SWTBotUtils.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2019 CEA LIST and others.
+ * Copyright (c) 2011, 2022 CEA LIST and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -57,6 +57,21 @@ public final class SWTBotUtils { private static boolean enableDebugScreenshots = true;
private static final String SCREENSHOT_DIR = "SWTBotScreenShots/"; //$NON-NLS-1$
private static final String SCREENSHOT_FORMAT = ".png"; //$NON-NLS-1$
+
+ /**
+ * As of 2022-06 and/or the pruning of CVS-defined Orbit contributions, the Jenkins build fails because
+ * org.slf4j.Logger is indirectly referenced from some .class file, so let's provide a direct reference
+ * and ensure that the conventional plumbing resolves it. See Bug 580266.
+ */
+ @SuppressWarnings("unused")
+ private static org.slf4j.Logger necessarySLF4Jreference = null;
+
+ /**
+ * log4j is never instantiated but is mentioned in a strange Eclipse-RegisterBuddy so it seems
+ * prudent to have a direct reference for org.apache.log4j too.
+ */
+ @SuppressWarnings("unused")
+ private static org.apache.log4j.Logger necessaryLOG4Jreference = null;
private SWTBotUtils() {
// Util class should not be instantiable
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/.classpath b/org.eclipse.modisco.facet.widgets.celleditors/.classpath index a0c6dd9ce..ca3785c41 100644 --- a/org.eclipse.modisco.facet.widgets.celleditors/.classpath +++ b/org.eclipse.modisco.facet.widgets.celleditors/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <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>
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs index 815cb35c3..e2e9c66d8 100644 --- a/org.eclipse.modisco.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,14 @@ -#Thu Oct 27 17:54:45 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.source=1.5
-
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/META-INF/MANIFEST.MF b/org.eclipse.modisco.facet.widgets.celleditors/META-INF/MANIFEST.MF index b77dc88fe..43381acb8 100644 --- a/org.eclipse.modisco.facet.widgets.celleditors/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.facet.widgets.celleditors/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.5.0.qualifier Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore,
org.eclipse.swt;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/pom.xml b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/pom.xml index 85d3be481..55796cf68 100644 --- a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/pom.xml +++ b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/pom.xml b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/pom.xml index c449e242c..823e326e6 100644 --- a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/pom.xml +++ b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.browser.custom.tests/pom.xml b/org.eclipse.modisco.infra.browser.custom.tests/pom.xml index f133d7198..a9849d8de 100644 --- a/org.eclipse.modisco.infra.browser.custom.tests/pom.xml +++ b/org.eclipse.modisco.infra.browser.custom.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.browser.custom.ui/.classpath b/org.eclipse.modisco.infra.browser.custom.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.infra.browser.custom.ui/.classpath +++ b/org.eclipse.modisco.infra.browser.custom.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.browser.custom.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.browser.custom.ui/.settings/org.eclipse.jdt.core.prefs index 410179e91..5bb6f67fb 100644 --- a/org.eclipse.modisco.infra.browser.custom.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.browser.custom.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,8 @@ -#Thu Jan 13 10:05:43 CET 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -17,6 +16,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -47,6 +47,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -74,8 +75,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -83,16 +86,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -174,11 +180,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -208,6 +215,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -231,12 +240,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -282,6 +295,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -317,8 +332,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -344,5 +362,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/org.eclipse.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF index ac27b3621..9f62f3f06 100644 --- a/org.eclipse.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.modisco.infra.browser.uicore;bundle-version="0.8.0", org.eclipse.modisco.infra.common.core;bundle-version="0.8.0", org.eclipse.modisco.facet.common.ui;bundle-version="0.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.infra.browser.custom.ui;x-friends:="org.eclipse.modisco.infra.browser.custom.editor", org.eclipse.modisco.infra.browser.custom.ui.controls;x-friends:="org.eclipse.modisco.infra.browser.custom.editor" diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.classpath b/org.eclipse.modisco.infra.browser.ecore.ui/.classpath index 9525fa783..ca3785c41 100644 --- a/org.eclipse.modisco.infra.browser.ecore.ui/.classpath +++ b/org.eclipse.modisco.infra.browser.ecore.ui/.classpath @@ -1,16 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2015 Mia-Software
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v2.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v20.html
-
-Contributors:
- Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
--->
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.jdt.core.prefs index 44217f8c0..11265a345 100644 --- a/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.ecore.ui/META-INF/MANIFEST.MF index 257487f94..e89cc6062 100644 --- a/org.eclipse.modisco.infra.browser.ecore.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.browser.ecore.ui/META-INF/MANIFEST.MF @@ -21,6 +21,6 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.modisco.infra.browser.ecore.ui.internal.Activator
Bundle-SymbolicName: org.eclipse.modisco.infra.browser.ecore.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.modisco.infra.browser.ecore.ui
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.classpath b/org.eclipse.modisco.infra.browser.editor.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.infra.browser.editor.ui/.classpath +++ b/org.eclipse.modisco.infra.browser.editor.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.jdt.core.prefs index 44217f8c0..11265a345 100644 --- a/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF index 18f0cc8bd..e6bbfc984 100644 --- a/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.modisco.facet.efacet.ui, org.eclipse.modisco.facet.efacet.edit.core;bundle-version="1.1.0", org.eclipse.emf.edit.ui;bundle-version="2.6.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.infra.browser.editor.ui, org.eclipse.modisco.infra.browser.editor.ui.exceptions diff --git a/org.eclipse.modisco.infra.browser.feature/feature.xml b/org.eclipse.modisco.infra.browser.feature/feature.xml index 36d942925..9a45cbb80 100644 --- a/org.eclipse.modisco.infra.browser.feature/feature.xml +++ b/org.eclipse.modisco.infra.browser.feature/feature.xml @@ -15,7 +15,7 @@ <feature
id="org.eclipse.modisco.infra.browser.feature"
label="%featureName"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.infra.browser"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF index f8165aeb2..61a61f920 100644 --- a/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF @@ -2,12 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.modisco.infra.browser.tests;singleton:=true -Bundle-Version: 1.5.0.qualifier +Bundle-Version: 1.5.3.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.swtbot.swt.finder;resolution:=optional, org.eclipse.swtbot.eclipse.finder, org.junit;bundle-version="4.7.0", - org.apache.log4j, org.hamcrest, org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", @@ -20,5 +19,7 @@ Require-Bundle: org.eclipse.swtbot.swt.finder;resolution:=optional, Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Eclipse-RegisterBuddy: org.apache.log4j +Import-Package: org.apache.log4j;version="[1.2.15,2.0.0)", + org.slf4j;resolution:=optional Export-Package: org.eclipse.modisco.infra.browser.tests;x-friends:="org.eclipse.modisco.tests" Automatic-Module-Name: org.eclipse.modisco.infra.browser.tests diff --git a/org.eclipse.modisco.infra.browser.tests/pom.xml b/org.eclipse.modisco.infra.browser.tests/pom.xml index 857849277..5920bbfeb 100644 --- a/org.eclipse.modisco.infra.browser.tests/pom.xml +++ b/org.eclipse.modisco.infra.browser.tests/pom.xml @@ -21,12 +21,12 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.infra.browser.tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/utils/TestUtils.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/utils/TestUtils.java index 0e7f5edf5..b41ce9250 100644 --- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/utils/TestUtils.java +++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/utils/TestUtils.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2010, 2019 Mia-Software and others.
+ * Copyright (c) 2010, 2022 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -64,6 +64,20 @@ import org.hamcrest.Matcher; public class TestUtils {
private static SWTWorkbenchBot fBot = new SWTWorkbenchBot();
+ /**
+ * As of 2022-06 and/or the pruning of CVS-defined Orbit contributions, the Jenkins build fails because
+ * org.slf4j.Logger is indirectly referenced from some .class file, so let's provide a direct reference
+ * and ensure that the conventional plumbing resolves it. See Bug 580266.
+ */
+ @SuppressWarnings("unused")
+ private static org.slf4j.Logger necessarySLF4Jreference = null;
+
+ /**
+ * log4j is never instantiated but is mentioned in a strange Eclipse-RegisterBuddy so it seems
+ * prudent to have a direct reference for org.apache.log4j too.
+ */
+ @SuppressWarnings("unused")
+ private static org.apache.log4j.Logger necessaryLOG4Jreference = null;
public static SWTBotTree getProjectExplorerTree() {
TestUtils.fBot.menu("Window").menu("Show View").menu("Project Explorer").click();
diff --git a/org.eclipse.modisco.infra.browser.uicore.examples.cnf/.classpath b/org.eclipse.modisco.infra.browser.uicore.examples.cnf/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.infra.browser.uicore.examples.cnf/.classpath +++ b/org.eclipse.modisco.infra.browser.uicore.examples.cnf/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.browser.uicore.examples.cnf/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.browser.uicore.examples.cnf/.settings/org.eclipse.jdt.core.prefs index c3493f20e..92ed7ecb8 100644 --- a/org.eclipse.modisco.infra.browser.uicore.examples.cnf/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.browser.uicore.examples.cnf/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,15 @@ -#Thu Apr 08 14:13:04 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -14,16 +17,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -84,9 +90,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
@@ -102,11 +111,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -136,6 +146,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -159,12 +171,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -210,6 +226,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -245,8 +263,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -271,4 +292,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/org.eclipse.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF index 379ab0941..59d79f099 100644 --- a/org.eclipse.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.modisco.infra.common.core;bundle-version="0.8.0", org.eclipse.ui.navigator.resources;bundle-version="3.4.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.modisco.infra.browser.uicore.examples.cnf diff --git a/org.eclipse.modisco.infra.browser/.classpath b/org.eclipse.modisco.infra.browser/.classpath index f17aee038..abbeeec41 100644 --- a/org.eclipse.modisco.infra.browser/.classpath +++ b/org.eclipse.modisco.infra.browser/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.browser/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.browser/.settings/org.eclipse.jdt.core.prefs index 33078d7eb..e3013f58a 100644 --- a/org.eclipse.modisco.infra.browser/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.browser/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,8 @@ -#Mon Sep 13 13:29:43 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -17,6 +16,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -47,6 +47,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -74,23 +75,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -146,9 +152,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
@@ -163,11 +172,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -197,6 +207,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -220,12 +232,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -271,6 +287,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -306,8 +324,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -332,4 +353,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/org.eclipse.modisco.infra.browser/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser/META-INF/MANIFEST.MF index eac429fa0..4a3d09203 100644 --- a/org.eclipse.modisco.infra.browser/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.browser/META-INF/MANIFEST.MF @@ -40,5 +40,5 @@ Require-Bundle: org.eclipse.ui.ide;visibility:=reexport, org.eclipse.modisco.facet.util.core;bundle-version="1.0.0"
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.modisco.infra.browser
diff --git a/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml b/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml index b7263eeb2..144ff8418 100644 --- a/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml +++ b/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.infra.cdo.derby.feature"
label="MoDisco CDO server with Derby"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.infra.common.core.tests/pom.xml b/org.eclipse.modisco.infra.common.core.tests/pom.xml index 44cf402c6..888d80263 100644 --- a/org.eclipse.modisco.infra.common.core.tests/pom.xml +++ b/org.eclipse.modisco.infra.common.core.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.common.ui/.classpath b/org.eclipse.modisco.infra.common.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.infra.common.ui/.classpath +++ b/org.eclipse.modisco.infra.common.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.common.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.common.ui/.settings/org.eclipse.jdt.core.prefs index dfd9ec1e5..cc5354078 100644 --- a/org.eclipse.modisco.infra.common.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.common.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Wed Feb 24 16:54:38 CET 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=warning
@@ -13,6 +12,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -43,6 +43,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -69,23 +70,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -141,9 +147,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
@@ -158,11 +167,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -192,6 +202,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -215,12 +227,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -266,6 +282,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -301,8 +319,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -327,4 +348,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/org.eclipse.modisco.infra.common.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.common.ui/META-INF/MANIFEST.MF index 35c771712..fd8a341db 100644 --- a/org.eclipse.modisco.infra.common.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.common.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.ui;bundle-version="3.6.0", com.ibm.icu;bundle-version="4.2.1" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Export-Package: org.eclipse.modisco.infra.common.ui.internal.actions;x-internal:=true, diff --git a/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml b/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml index 6cee01ceb..93048ac47 100644 --- a/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml +++ b/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml @@ -16,7 +16,7 @@ <feature
id="org.eclipse.modisco.infra.discovery.benchmark.feature"
label="MoDisco Infrastructure Discovery Benchmark"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/.classpath b/org.eclipse.modisco.infra.discovery.benchmark.ui/.classpath index e334ecd97..ca3785c41 100644 --- a/org.eclipse.modisco.infra.discovery.benchmark.ui/.classpath +++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/.classpath @@ -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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.discovery.benchmark.ui/.settings/org.eclipse.jdt.core.prefs index 44217f8c0..11265a345 100644 --- a/org.eclipse.modisco.infra.discovery.benchmark.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF index 53814f212..e9a564fa0 100644 --- a/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.modisco.infra.discovery.benchmark.metamodel;bundle-version="0.10.0", org.eclipse.modisco.infra.discovery.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.modisco.infra.discovery.benchmark.ui diff --git a/org.eclipse.modisco.infra.discovery.core.tests/pom.xml b/org.eclipse.modisco.infra.discovery.core.tests/pom.xml index fd82bbafe..2a1b8be9f 100644 --- a/org.eclipse.modisco.infra.discovery.core.tests/pom.xml +++ b/org.eclipse.modisco.infra.discovery.core.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.discovery.ui.tests/pom.xml b/org.eclipse.modisco.infra.discovery.ui.tests/pom.xml index e9acde9c0..2d34cc07f 100644 --- a/org.eclipse.modisco.infra.discovery.ui.tests/pom.xml +++ b/org.eclipse.modisco.infra.discovery.ui.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.discovery.ui/.classpath b/org.eclipse.modisco.infra.discovery.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.infra.discovery.ui/.classpath +++ b/org.eclipse.modisco.infra.discovery.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.discovery.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.discovery.ui/.settings/org.eclipse.jdt.core.prefs index b74229db6..a09b5eb2c 100644 --- a/org.eclipse.modisco.infra.discovery.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.discovery.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,8 @@ -#Mon Jan 10 15:44:10 CET 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -17,6 +16,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -48,6 +48,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -75,8 +76,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -84,16 +87,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -175,11 +181,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -209,6 +216,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -232,12 +241,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -283,6 +296,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -318,8 +333,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -345,5 +363,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF index 1f85fe3b8..8ad9d1f69 100644 --- a/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui, com.ibm.icu;bundle-version="4.2.1", org.eclipse.modisco.facet.widgets.celleditors.ecore;bundle-version="0.1.0", org.eclipse.emf.common.ui;bundle-version="2.6.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.infra.discovery.ui, org.eclipse.modisco.infra.discovery.ui.internal.actions;x-internal:=true, diff --git a/org.eclipse.modisco.infra.doc.tests/pom.xml b/org.eclipse.modisco.infra.doc.tests/pom.xml index 006f23b64..70f608a2f 100644 --- a/org.eclipse.modisco.infra.doc.tests/pom.xml +++ b/org.eclipse.modisco.infra.doc.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.facet.editor/.classpath b/org.eclipse.modisco.infra.facet.editor/.classpath index 0ccbfd54a..dcfdc28e8 100644 --- a/org.eclipse.modisco.infra.facet.editor/.classpath +++ b/org.eclipse.modisco.infra.facet.editor/.classpath @@ -1,8 +1,8 @@ <?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-gen"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.infra.facet.editor/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.facet.editor/.settings/org.eclipse.jdt.core.prefs index 3e0c1eaab..e1696441b 100644 --- a/org.eclipse.modisco.infra.facet.editor/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.facet.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Thu Jan 13 10:06:56 CET 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -13,6 +12,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled @@ -43,6 +43,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -68,8 +69,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -77,16 +80,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -168,11 +174,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -202,6 +209,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -225,12 +234,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -276,6 +289,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -311,8 +326,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -338,5 +356,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/org.eclipse.modisco.infra.facet.editor/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.facet.editor/META-INF/MANIFEST.MF index 015001da6..7863afaf7 100644 --- a/org.eclipse.modisco.infra.facet.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.facet.editor/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.modisco.infra.facet.editor.presentation.FacetEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
org.eclipse.modisco.infra.facet.edit;visibility:=reexport,
diff --git a/org.eclipse.modisco.infra.facet.tests/.classpath b/org.eclipse.modisco.infra.facet.tests/.classpath index 26a45007c..8aa6a9112 100644 --- a/org.eclipse.modisco.infra.facet.tests/.classpath +++ b/org.eclipse.modisco.infra.facet.tests/.classpath @@ -1,8 +1,8 @@ <?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="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.infra.facet.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.facet.tests/.settings/org.eclipse.jdt.core.prefs index 4eee1bf6f..11265a345 100644 --- a/org.eclipse.modisco.infra.facet.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.facet.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,10 @@ -#Fri Nov 06 16:43:16 CET 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF index fe701e1b7..930b87f1e 100644 --- a/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.5.0.qualifier Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.modisco.infra.query;visibility:=reexport,
diff --git a/org.eclipse.modisco.infra.facet.tests/pom.xml b/org.eclipse.modisco.infra.facet.tests/pom.xml index 42cd8bbb2..57533168c 100644 --- a/org.eclipse.modisco.infra.facet.tests/pom.xml +++ b/org.eclipse.modisco.infra.facet.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.facet.ui/.classpath b/org.eclipse.modisco.infra.facet.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.infra.facet.ui/.classpath +++ b/org.eclipse.modisco.infra.facet.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.facet.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.facet.ui/.settings/org.eclipse.jdt.core.prefs index 3caa0f581..2ef6d5055 100644 --- a/org.eclipse.modisco.infra.facet.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.facet.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,27 +1,33 @@ -#Tue Nov 24 11:25:45 CET 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -77,9 +83,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
@@ -94,11 +103,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -128,6 +138,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -151,12 +163,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -202,6 +218,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -237,8 +255,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -263,4 +284,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/org.eclipse.modisco.infra.facet.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.facet.ui/META-INF/MANIFEST.MF index 2a74619cf..bb682bcbe 100644 --- a/org.eclipse.modisco.infra.facet.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.facet.ui/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.modisco.infra.facet.editor, org.eclipse.modisco.infra.common.ui, org.eclipse.modisco.facet.common.ui;bundle-version="0.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.infra.facet.ui.views;x-friends:="org.eclipse.modisco.infra.browser" Automatic-Module-Name: org.eclipse.modisco.infra.facet.ui diff --git a/org.eclipse.modisco.infra.omg.feature/feature.xml b/org.eclipse.modisco.infra.omg.feature/feature.xml index 0db58a45a..2e8aa5578 100644 --- a/org.eclipse.modisco.infra.omg.feature/feature.xml +++ b/org.eclipse.modisco.infra.omg.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.infra.omg.feature"
label="MoDisco OMG meta-models implementations and tools"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.util.atl.core"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.infra.query.editor/.classpath b/org.eclipse.modisco.infra.query.editor/.classpath index 26a45007c..8aa6a9112 100644 --- a/org.eclipse.modisco.infra.query.editor/.classpath +++ b/org.eclipse.modisco.infra.query.editor/.classpath @@ -1,8 +1,8 @@ <?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="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.infra.query.editor/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.query.editor/.settings/org.eclipse.jdt.core.prefs index 0b19567c6..1119bf3be 100644 --- a/org.eclipse.modisco.infra.query.editor/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.query.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Wed Feb 17 16:29:05 CET 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -13,6 +12,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
@@ -43,6 +43,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -69,23 +70,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -141,9 +147,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
@@ -158,11 +167,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -192,6 +202,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -215,12 +227,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -266,6 +282,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -301,8 +319,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -327,4 +348,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/org.eclipse.modisco.infra.query.editor/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.query.editor/META-INF/MANIFEST.MF index 8b126e5cc..e6ef9bb64 100644 --- a/org.eclipse.modisco.infra.query.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.query.editor/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.modisco.infra.query.editor.presentation.QueryEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.modisco.infra.query.editor.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
diff --git a/org.eclipse.modisco.infra.query.jxpath/.classpath b/org.eclipse.modisco.infra.query.jxpath/.classpath index f2b475abe..dcfdc28e8 100644 --- a/org.eclipse.modisco.infra.query.jxpath/.classpath +++ b/org.eclipse.modisco.infra.query.jxpath/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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-gen"/>
<classpathentry kind="src" path="src"/>
diff --git a/org.eclipse.modisco.infra.query.jxpath/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.query.jxpath/.settings/org.eclipse.jdt.core.prefs index c0af9a763..020991c26 100644 --- a/org.eclipse.modisco.infra.query.jxpath/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.query.jxpath/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ -#Thu Oct 27 17:54:45 CEST 2011
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -9,6 +11,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -38,6 +42,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -63,7 +68,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -71,17 +79,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -165,11 +176,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -199,6 +211,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -223,13 +237,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -276,6 +294,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -312,9 +332,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -340,6 +363,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.modisco.infra.query.jxpath/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.query.jxpath/META-INF/MANIFEST.MF index 2d1f9a4ab..397b63704 100644 --- a/org.eclipse.modisco.infra.query.jxpath/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.query.jxpath/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.5.0.qualifier Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.modisco.infra.query.jxpath,
org.eclipse.modisco.infra.query.jxpath.impl;x-internal:=true,
org.eclipse.modisco.infra.query.jxpath.query,
diff --git a/org.eclipse.modisco.infra.query.tests/.classpath b/org.eclipse.modisco.infra.query.tests/.classpath index 4cc715d53..8aa6a9112 100644 --- a/org.eclipse.modisco.infra.query.tests/.classpath +++ b/org.eclipse.modisco.infra.query.tests/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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="src" path="src-gen"/>
diff --git a/org.eclipse.modisco.infra.query.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.query.tests/.settings/org.eclipse.jdt.core.prefs index f36f0c54f..c4149e105 100644 --- a/org.eclipse.modisco.infra.query.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.query.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,16 +1,19 @@ -#Mon Mar 29 18:45:29 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -18,16 +21,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -88,9 +94,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
@@ -106,11 +115,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -140,6 +150,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -163,12 +175,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -214,6 +230,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -249,8 +267,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -275,4 +296,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF index 259fe45ac..736b03cf3 100644 --- a/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.modisco.infra.common.ui;bundle-version="0.6.0", org.eclipse.core.runtime;bundle-version="3.5.0", org.eclipse.modisco.facet.util.pde.core;bundle-version="1.0.0", org.eclipse.modisco.facet.util.core;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.infra.query.tests, org.eclipse.modisco.infra.query.tests.samples, diff --git a/org.eclipse.modisco.infra.query.tests/pom.xml b/org.eclipse.modisco.infra.query.tests/pom.xml index 96698987c..14cda14c2 100644 --- a/org.eclipse.modisco.infra.query.tests/pom.xml +++ b/org.eclipse.modisco.infra.query.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.infra.query.ui/.classpath b/org.eclipse.modisco.infra.query.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.infra.query.ui/.classpath +++ b/org.eclipse.modisco.infra.query.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.infra.query.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.query.ui/.settings/org.eclipse.jdt.core.prefs index 6a8def4a2..2ef6d5055 100644 --- a/org.eclipse.modisco.infra.query.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.infra.query.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,27 +1,33 @@ -#Tue Nov 24 10:47:38 CET 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -77,9 +83,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
@@ -94,11 +103,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -128,6 +138,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -151,12 +163,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -202,6 +218,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -237,8 +255,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -263,4 +284,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/org.eclipse.modisco.infra.query.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.query.ui/META-INF/MANIFEST.MF index 6d2b574bc..032fe853c 100644 --- a/org.eclipse.modisco.infra.query.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.query.ui/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.modisco.infra.query.editor, org.eclipse.emf.codegen.ecore;bundle-version="2.6.0", org.eclipse.modisco.facet.common.ui;bundle-version="0.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.infra.query.ui.actions, org.eclipse.modisco.infra.query.ui.controls;x-friends:="org.eclipse.modisco.infra.browser,org.eclipse.modisco.infra.browser.custom.editor", diff --git a/org.eclipse.modisco.infrastructure.feature/feature.xml b/org.eclipse.modisco.infrastructure.feature/feature.xml index 22c7bcba5..66623429b 100644 --- a/org.eclipse.modisco.infrastructure.feature/feature.xml +++ b/org.eclipse.modisco.infrastructure.feature/feature.xml @@ -14,7 +14,7 @@ <feature
id="org.eclipse.modisco.infrastructure.feature"
label="%featureName"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.infra.common.core"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.java.browser.customization.tests/pom.xml b/org.eclipse.modisco.java.browser.customization.tests/pom.xml index 7062e8b27..33bfcae3c 100644 --- a/org.eclipse.modisco.java.browser.customization.tests/pom.xml +++ b/org.eclipse.modisco.java.browser.customization.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.java.cdo.feature/feature.xml b/org.eclipse.modisco.java.cdo.feature/feature.xml index 119e02336..a356949e6 100644 --- a/org.eclipse.modisco.java.cdo.feature/feature.xml +++ b/org.eclipse.modisco.java.cdo.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.java.cdo.feature"
label="MoDisco CDO Java Discoverer feature"
- version="1.5.2.qualifier" + version="1.5.5.qualifier" provider-name="%providerName"
plugin="org.eclipse.modisco.java.cdo"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.java.composition.browser.customization/.classpath b/org.eclipse.modisco.java.composition.browser.customization/.classpath index a0c6dd9ce..f01a977e5 100644 --- a/org.eclipse.modisco.java.composition.browser.customization/.classpath +++ b/org.eclipse.modisco.java.composition.browser.customization/.classpath @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <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 exported="true" kind="lib" path="bin" sourcepath="bin"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.java.composition.browser.customization/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.java.composition.browser.customization/.settings/org.eclipse.jdt.core.prefs index 1a04105b0..fa6c5cf09 100644 --- a/org.eclipse.modisco.java.composition.browser.customization/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.java.composition.browser.customization/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,14 @@ -#Thu Jan 13 10:12:53 CET 2011 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -8,16 +16,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -99,11 +110,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -133,6 +145,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -156,12 +170,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -207,6 +225,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -242,8 +262,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -269,5 +292,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF index e91924684..e244aa0de 100644 --- a/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.modisco.java;bundle-version="0.9.0", org.eclipse.modisco.java.composition;bundle-version="0.9.0", org.eclipse.modisco.kdm.source.extension;bundle-version="0.9.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-ClassPath: .,bin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF index da7c78645..ae9de9af3 100644 --- a/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer;singleton:=true -Bundle-Version: 1.5.0.qualifier +Bundle-Version: 1.5.4.qualifier Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui, diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/AbstractDiscoverKDMSourceAndJavaModel.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/AbstractDiscoverKDMSourceAndJavaModel.java index 324781e2d..68d7fe1f0 100644 --- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/AbstractDiscoverKDMSourceAndJavaModel.java +++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/AbstractDiscoverKDMSourceAndJavaModel.java @@ -423,11 +423,9 @@ public abstract class AbstractDiscoverKDMSourceAndJavaModel<T> extends // List all compilation unit in the model
List<CompilationUnit> compilationUnitList = new ArrayList<CompilationUnit>();
- // bug 332068: we have to filter all compilation units named "package-info.java"
+ // The Bug 397384 fix ensures we have no compilation units named "package-info.java"
for (CompilationUnit cu : getJavaModel().getCompilationUnits()) {
- if (!cu.getName().equals("package-info.java")) { //$NON-NLS-1$
- compilationUnitList.add(cu);
- } // else it is only javadoc or annotations for parent package
+ compilationUnitList.add(cu);
}
// List all Source File in the model
diff --git a/org.eclipse.modisco.java.composition.ui/.classpath b/org.eclipse.modisco.java.composition.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.java.composition.ui/.classpath +++ b/org.eclipse.modisco.java.composition.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.java.composition.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.java.composition.ui/.settings/org.eclipse.jdt.core.prefs index 57405b027..5ab0cc7d4 100644 --- a/org.eclipse.modisco.java.composition.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.java.composition.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,15 @@ -#Thu Jan 13 10:13:15 CET 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -14,16 +17,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -105,11 +111,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -139,6 +146,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,12 +171,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -213,6 +226,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -248,8 +263,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -275,5 +293,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF index 6a053d9b8..c2f40661e 100644 --- a/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.modisco.infra.common.core;bundle-version="0.9.0", org.eclipse.jface.text;bundle-version="3.6.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.modisco.java.composition.ui.strategies;x-friends:="org.eclipse.modisco.java.composition.discoverer.tests" Automatic-Module-Name: org.eclipse.modisco.java.composition.ui diff --git a/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml b/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml index d2dbe171b..0cacf6075 100644 --- a/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml +++ b/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml @@ -12,7 +12,7 @@ Contributors: <feature
id="org.eclipse.modisco.java.discoverer.benchmark.feature"
label="MoDisco Java Discoverer Benchmark feature"
- version="1.5.2.qualifier" + version="1.5.5.qualifier" provider-name="%providerName"
plugin="org.eclipse.modisco.java.discoverer.benchmark"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.java.discoverer.benchmark/.classpath b/org.eclipse.modisco.java.discoverer.benchmark/.classpath index a0c6dd9ce..f01a977e5 100644 --- a/org.eclipse.modisco.java.discoverer.benchmark/.classpath +++ b/org.eclipse.modisco.java.discoverer.benchmark/.classpath @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <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 exported="true" kind="lib" path="bin" sourcepath="bin"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.java.discoverer.benchmark/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.java.discoverer.benchmark/.settings/org.eclipse.jdt.core.prefs index 99c154f07..03123e063 100644 --- a/org.eclipse.modisco.java.discoverer.benchmark/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.java.discoverer.benchmark/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,8 @@ -#Thu Jun 03 15:28:59 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -17,6 +16,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
@@ -47,6 +47,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -72,8 +73,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -81,16 +84,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -151,9 +157,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
@@ -169,11 +178,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -203,6 +213,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -226,12 +238,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -277,6 +293,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -312,8 +330,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -339,5 +360,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.modisco.java.discoverer.benchmark/JavaJUnitEMF cdo.launch b/org.eclipse.modisco.java.discoverer.benchmark/JavaJUnitEMF cdo.launch index 00325d46c..f42079106 100644 --- a/org.eclipse.modisco.java.discoverer.benchmark/JavaJUnitEMF cdo.launch +++ b/org.eclipse.modisco.java.discoverer.benchmark/JavaJUnitEMF cdo.launch @@ -36,7 +36,7 @@ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.modisco.java.discoverer.tests.cdo.server.JavaJunitCDO"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.modisco.java.discovorg.eclipse.modisco.java.discoverer.tests.cdo.server.JavaJunitCDORCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.epp.package.modeling.product"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
diff --git a/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF index 433479a68..3ca37ba99 100644 --- a/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF @@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.modisco.java;bundle-version="0.7.0", org.eclipse.ui.ide;bundle-version="3.6.0", org.eclipse.ui, org.eclipse.core.resources -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.modisco.java.discoverer.benchmark;x-friends:="org.eclipse.modisco.java.composition.discoverer.benchmark,org.eclipse.modisco.java.discoverer.benchmark.tests", org.eclipse.modisco.java.discoverer.benchmark.emf.client;x-friends:="org.eclipse.modisco.java.discoverer.benchmark.tests", org.eclipse.modisco.java.discoverer.benchmark.emfstat;x-friends:="org.eclipse.modisco.java.composition.discoverer.benchmark", diff --git a/org.eclipse.modisco.java.discoverer.cdo.tests/pom.xml b/org.eclipse.modisco.java.discoverer.cdo.tests/pom.xml index 4a831d3a5..f0ccb80ab 100644 --- a/org.eclipse.modisco.java.discoverer.cdo.tests/pom.xml +++ b/org.eclipse.modisco.java.discoverer.cdo.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF index b4cf53b4a..857367a4f 100644 --- a/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.tests;singleton:=true
-Bundle-Version: 1.5.1.qualifier
+Bundle-Version: 1.5.5.qualifier
Bundle-Activator: org.eclipse.modisco.java.discoverer.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
diff --git a/org.eclipse.modisco.java.discoverer.tests/pom.xml b/org.eclipse.modisco.java.discoverer.tests/pom.xml index 4fb942cb7..d341c09f5 100644 --- a/org.eclipse.modisco.java.discoverer.tests/pom.xml +++ b/org.eclipse.modisco.java.discoverer.tests/pom.xml @@ -21,12 +21,12 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.java.discoverer.tests</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.modisco.java.discoverer.tests/workspace/bug318631/src/Empty.java b/org.eclipse.modisco.java.discoverer.tests/workspace/bug318631/src/Empty.java new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/org.eclipse.modisco.java.discoverer.tests/workspace/bug318631/src/Empty.java diff --git a/org.eclipse.modisco.java.discoverer.ui/.classpath b/org.eclipse.modisco.java.discoverer.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.java.discoverer.ui/.classpath +++ b/org.eclipse.modisco.java.discoverer.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.java.discoverer.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.java.discoverer.ui/.settings/org.eclipse.jdt.core.prefs index 11c85bac1..11265a345 100644 --- a/org.eclipse.modisco.java.discoverer.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.java.discoverer.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,10 @@ -#Mon Feb 28 15:51:54 CET 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF index 4c3fc1e5a..980d9dc1c 100644 --- a/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF @@ -16,6 +16,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.ui;bundle-version="3.6.0", org.eclipse.modisco.infra.common.core;bundle-version="0.9.0", org.eclipse.modisco.infra.discovery.core;bundle-version="0.9.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.modisco.java.discoverer.ui diff --git a/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF index beb9706bb..4d99e468d 100644 --- a/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer;singleton:=true
-Bundle-Version: 1.5.1.qualifier
+Bundle-Version: 1.5.4.qualifier
Bundle-Name: %Bundle-Name
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.modisco.infra.common.core,
diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitor.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitor.java index 05bd8a126..99a9c065e 100644 --- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitor.java +++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitor.java @@ -733,18 +733,19 @@ public class JDTVisitor extends ASTVisitor { @Override
public boolean visit(final org.eclipse.jdt.core.dom.CompilationUnit node) {
this.cuNode = node;
-
- CompilationUnit element = this.factory.createCompilationUnit();
- this.binding.put(node, element);
-
- if (!this.isINCREMENTALDISCOVERING) {
- // we check if any of the top-level types of this compilation unit
- // are already defined in the model
- for (Iterator<?> iterator = node.types().iterator(); iterator.hasNext();) {
- if (isTypeAlreadyVisited((org.eclipse.jdt.core.dom.AbstractTypeDeclaration) iterator
- .next())) {
- this.isAlreadyVisited = true;
- return false;
+ if (node.types().size() > 0) { // Bug 397384 ignore empty files, Bug 332068 ignore package-info.java
+ CompilationUnit element = this.factory.createCompilationUnit();
+ this.binding.put(node, element);
+
+ if (!this.isINCREMENTALDISCOVERING) {
+ // we check if any of the top-level types of this compilation unit
+ // are already defined in the model
+ for (Iterator<?> iterator = node.types().iterator(); iterator.hasNext();) {
+ if (isTypeAlreadyVisited((org.eclipse.jdt.core.dom.AbstractTypeDeclaration) iterator
+ .next())) {
+ this.isAlreadyVisited = true;
+ return false;
+ }
}
}
}
diff --git a/org.eclipse.modisco.java.feature/feature.xml b/org.eclipse.modisco.java.feature/feature.xml index dd843ea21..12e9d40c0 100644 --- a/org.eclipse.modisco.java.feature/feature.xml +++ b/org.eclipse.modisco.java.feature/feature.xml @@ -13,7 +13,7 @@ <feature
id="org.eclipse.modisco.java.feature"
label="MoDisco Java Feature"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.java"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.java.generation.tests/pom.xml b/org.eclipse.modisco.java.generation.tests/pom.xml index e2ea04b5a..14504983d 100644 --- a/org.eclipse.modisco.java.generation.tests/pom.xml +++ b/org.eclipse.modisco.java.generation.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.java.generation/src/org/eclipse/modisco/java/generation/utils/JavaUtils.java b/org.eclipse.modisco.java.generation/src/org/eclipse/modisco/java/generation/utils/JavaUtils.java index 40e7fd5e9..340ad1bb3 100644 --- a/org.eclipse.modisco.java.generation/src/org/eclipse/modisco/java/generation/utils/JavaUtils.java +++ b/org.eclipse.modisco.java.generation/src/org/eclipse/modisco/java/generation/utils/JavaUtils.java @@ -100,7 +100,8 @@ public final class JavaUtils { private static org.eclipse.jdt.core.formatter.CodeFormatter getDefaultFormatter() {
if (JavaUtils.sourceFormatter == null) {
// Take default Eclipse formatting options
- Map<Object, Object> options = org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants
+ // (getEclipseDefaultSettings returned Map up until 4.31)
+ Map<String, String> options = (Map<String, String>) org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants
.getEclipseDefaultSettings();
// Initialize the compiler settings
diff --git a/org.eclipse.modisco.java.queries.tests/pom.xml b/org.eclipse.modisco.java.queries.tests/pom.xml index 8b09202ec..b5d4da5bf 100644 --- a/org.eclipse.modisco.java.queries.tests/pom.xml +++ b/org.eclipse.modisco.java.queries.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/pom.xml b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/pom.xml index 6a069336a..352812b24 100644 --- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/pom.xml +++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.jee.feature/feature.xml b/org.eclipse.modisco.jee.feature/feature.xml index 623b120ca..8f8d08fb8 100644 --- a/org.eclipse.modisco.jee.feature/feature.xml +++ b/org.eclipse.modisco.jee.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.jee.feature"
label="MoDisco JEE feature"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.jee"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/pom.xml b/org.eclipse.modisco.jee.jsp.discoverer.tests/pom.xml index 189b4f156..703a7cb6a 100644 --- a/org.eclipse.modisco.jee.jsp.discoverer.tests/pom.xml +++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF index 64d770279..5b79f7fd7 100644 --- a/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.generation.tests -Bundle-Version: 1.5.0.qualifier +Bundle-Version: 1.5.3.qualifier Bundle-Activator: org.eclipse.modisco.jee.jsp.generation.tests.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui, diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/pom.xml b/org.eclipse.modisco.jee.jsp.generation.tests/pom.xml index 25c0f4d79..333c21812 100644 --- a/org.eclipse.modisco.jee.jsp.generation.tests/pom.xml +++ b/org.eclipse.modisco.jee.jsp.generation.tests/pom.xml @@ -21,12 +21,12 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.jee.jsp.generation.tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java index 145d969c6..05ddccca4 100644 --- a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java +++ b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2010-2019 Mia-Software and others.
+ * Copyright (c) 2010-2022 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -57,9 +57,12 @@ public class DiffGeneratedJspTest { }
public boolean accept(final File file, final String fileName) {
- return ((new File(file, fileName).isDirectory() && fileName
- .indexOf("svn") == -1) || fileName.toLowerCase().endsWith(//$NON-NLS-1$
- ".jsp")); //$NON-NLS-1$
+ if (new File(file, fileName).isDirectory()) {
+ return !".settings".equals(fileName) && (fileName.indexOf("svn") == -1); //$NON-NLS-1$
+ }
+ else {
+ return fileName.toLowerCase().endsWith(".jsp"); //$NON-NLS-1$
+ }
}
}
diff --git a/org.eclipse.modisco.jee.jsp/.classpath b/org.eclipse.modisco.jee.jsp/.classpath index 49204bcc3..7acc2b92a 100644 --- a/org.eclipse.modisco.jee.jsp/.classpath +++ b/org.eclipse.modisco.jee.jsp/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <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-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.jee.jsp/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.jee.jsp/.settings/org.eclipse.jdt.core.prefs index 91152f896..c1bc19550 100644 --- a/org.eclipse.modisco.jee.jsp/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.jee.jsp/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ -#Tue Feb 15 11:21:04 CET 2011
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -9,6 +11,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -41,6 +45,7 @@ org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -69,7 +74,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -77,16 +85,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -168,11 +179,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -202,6 +214,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -225,12 +239,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -276,6 +294,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -311,8 +331,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -338,5 +361,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF index 5e9b26f31..3ad22cec3 100644 --- a/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.5.0.qualifier Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.modisco.jee.jsp,
org.eclipse.modisco.jee.jsp.impl;x-internal:=true,
org.eclipse.modisco.jee.jsp.util;x-internal:=true
diff --git a/org.eclipse.modisco.jee.queries.tests/pom.xml b/org.eclipse.modisco.jee.queries.tests/pom.xml index 6224a2cbf..5d9794e7d 100644 --- a/org.eclipse.modisco.jee.queries.tests/pom.xml +++ b/org.eclipse.modisco.jee.queries.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/pom.xml b/org.eclipse.modisco.jee.webapp.discoverer.tests/pom.xml index 7a8e45a38..f5aee1dfc 100644 --- a/org.eclipse.modisco.jee.webapp.discoverer.tests/pom.xml +++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.jee/.classpath b/org.eclipse.modisco.jee/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.jee/.classpath +++ b/org.eclipse.modisco.jee/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.jee/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.jee/.settings/org.eclipse.jdt.core.prefs index 617a55160..5ab0cc7d4 100644 --- a/org.eclipse.modisco.jee/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.jee/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,15 @@ -#Thu Jan 13 10:13:21 CET 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -14,16 +17,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -105,11 +111,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -139,6 +146,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,12 +171,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -213,6 +226,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -248,8 +263,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -275,5 +293,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/org.eclipse.modisco.jee/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee/META-INF/MANIFEST.MF index b4025cc2a..995f2aa08 100644 --- a/org.eclipse.modisco.jee/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.jee/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.modisco.jee;singleton:=true Bundle-Version: 1.5.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.resources;bundle-version="3.6.0", diff --git a/org.eclipse.modisco.kdm.source.extension.ui/.classpath b/org.eclipse.modisco.kdm.source.extension.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.kdm.source.extension.ui/.classpath +++ b/org.eclipse.modisco.kdm.source.extension.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.kdm.source.extension.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.kdm.source.extension.ui/.settings/org.eclipse.jdt.core.prefs index cf6a76ad0..5ab0cc7d4 100644 --- a/org.eclipse.modisco.kdm.source.extension.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.kdm.source.extension.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,15 @@ -#Thu Jan 13 10:14:34 CET 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -14,16 +17,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -105,11 +111,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -139,6 +146,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -162,12 +171,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -213,6 +226,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -248,8 +263,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -275,5 +293,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF index f2fdd64c0..ad8e2f08c 100644 --- a/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.editors;bundle-version="3.6.0", org.eclipse.modisco.infra.common.core;bundle-version="0.9.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.modisco.kdm.source.extension.ui.actions, org.eclipse.modisco.kdm.source.extension.ui.interfaces, org.eclipse.modisco.kdm.source.extension.ui.utils diff --git a/org.eclipse.modisco.kdm.source.extension/.classpath b/org.eclipse.modisco.kdm.source.extension/.classpath index 26a45007c..8aa6a9112 100644 --- a/org.eclipse.modisco.kdm.source.extension/.classpath +++ b/org.eclipse.modisco.kdm.source.extension/.classpath @@ -1,8 +1,8 @@ <?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="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.kdm.source.extension/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.kdm.source.extension/.settings/org.eclipse.jdt.core.prefs index 5674081e7..4d0f8a9bf 100644 --- a/org.eclipse.modisco.kdm.source.extension/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.kdm.source.extension/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,8 @@ -#Tue Mar 29 11:08:09 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -17,6 +16,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -50,6 +50,7 @@ org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -78,8 +79,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -87,16 +90,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -178,11 +184,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -212,6 +219,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -235,12 +244,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -286,6 +299,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -321,8 +336,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -348,5 +366,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF index 2e9da0d7c..d638b6c56 100644 --- a/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.5.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.modisco.kdm.source.extension.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.modisco.kdm.source.extension; x-friends:="org.eclipse.modisco.kdm.source.extension.ui, org.eclipse.modisco.java.composition.discoverer, diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/pom.xml b/org.eclipse.modisco.kdm.uml2converter.tests/pom.xml index 63e260b36..f34e15159 100644 --- a/org.eclipse.modisco.kdm.uml2converter.tests/pom.xml +++ b/org.eclipse.modisco.kdm.uml2converter.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/HotTransformationTest.java b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/HotTransformationTest.java index 7debb2928..bf304d04b 100644 --- a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/HotTransformationTest.java +++ b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/HotTransformationTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2008, 2019 Mia-Software and others.
+ * Copyright (c) 2008, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java index 3d77835d4..a494ad911 100644 --- a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java +++ b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2008, 2019 Mia-Software and others.
+ * Copyright (c) 2008, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java index 0b8b7e049..f482ef04e 100644 --- a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java +++ b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2008, 2019 Mia-Software and others.
+ * Copyright (c) 2008, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/DiscoverUmlModelFromKdmModel.java b/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/DiscoverUmlModelFromKdmModel.java index f27476d0b..93e509388 100644 --- a/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/DiscoverUmlModelFromKdmModel.java +++ b/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/DiscoverUmlModelFromKdmModel.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2019 Mia-Software and others.
+ * Copyright (c) 2011, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/KdmToUmlConverter.java b/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/KdmToUmlConverter.java index 153f38418..58188c106 100644 --- a/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/KdmToUmlConverter.java +++ b/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/KdmToUmlConverter.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2019 Mia-Software and others.
+ * Copyright (c) 2011, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.omg.gastm/.classpath b/org.eclipse.modisco.omg.gastm/.classpath index 49204bcc3..7acc2b92a 100644 --- a/org.eclipse.modisco.omg.gastm/.classpath +++ b/org.eclipse.modisco.omg.gastm/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <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-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.omg.gastm/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.omg.gastm/.settings/org.eclipse.jdt.core.prefs index e42b243ad..8760dacdf 100644 --- a/org.eclipse.modisco.omg.gastm/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.omg.gastm/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ -#Thu Jan 13 10:15:05 CET 2011 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -9,6 +11,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -38,6 +42,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -65,7 +70,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -73,16 +81,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -164,11 +175,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -198,6 +210,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -221,12 +235,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -272,6 +290,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -307,8 +327,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -334,5 +357,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF b/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF index 6e86d3f61..8ab036397 100644 --- a/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.5.0.qualifier Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.modisco.omg.gastm,
org.eclipse.modisco.omg.gastm.impl;x-internal:=true,
org.eclipse.modisco.omg.gastm.util;x-internal:=true
diff --git a/org.eclipse.modisco.omg.kdm.edit/.classpath b/org.eclipse.modisco.omg.kdm.edit/.classpath index 49204bcc3..7acc2b92a 100644 --- a/org.eclipse.modisco.omg.kdm.edit/.classpath +++ b/org.eclipse.modisco.omg.kdm.edit/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <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-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.modisco.omg.kdm.edit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.omg.kdm.edit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..bd1095bb3 --- /dev/null +++ b/org.eclipse.modisco.omg.kdm.edit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.omg.kdm.edit/META-INF/MANIFEST.MF b/org.eclipse.modisco.omg.kdm.edit/META-INF/MANIFEST.MF index bca2ca9e1..de57be2ea 100644 --- a/org.eclipse.modisco.omg.kdm.edit/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.omg.kdm.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.modisco.omg.kdm.core.provider.KdmEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.modisco.omg.kdm;visibility:=reexport,
org.eclipse.emf.edit
diff --git a/org.eclipse.modisco.omg.kdm/.classpath b/org.eclipse.modisco.omg.kdm/.classpath index 3e4371a5f..7acc2b92a 100644 --- a/org.eclipse.modisco.omg.kdm/.classpath +++ b/org.eclipse.modisco.omg.kdm/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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-gen"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.modisco.omg.kdm/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.omg.kdm/.settings/org.eclipse.jdt.core.prefs index e1557b253..114f61945 100644 --- a/org.eclipse.modisco.omg.kdm/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.omg.kdm/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,16 @@ -#Thu Jan 13 10:09:38 CET 2011 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -33,6 +37,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -58,7 +63,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -66,16 +74,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -157,11 +168,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -191,6 +203,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -214,12 +228,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -265,6 +283,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -300,8 +320,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -327,5 +350,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/org.eclipse.modisco.omg.kdm/META-INF/MANIFEST.MF b/org.eclipse.modisco.omg.kdm/META-INF/MANIFEST.MF index 973bdd839..cfcb35147 100644 --- a/org.eclipse.modisco.omg.kdm/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.omg.kdm/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.5.0.qualifier Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.modisco.omg.kdm,
org.eclipse.modisco.omg.kdm.action,
org.eclipse.modisco.omg.kdm.action.impl;x-internal:=true,
diff --git a/org.eclipse.modisco.releng.tycho/.launches/Build MoDisco Promote Test.launch b/org.eclipse.modisco.releng.tycho/.launches/Build MoDisco Promote Test.launch new file mode 100644 index 000000000..2be0cae57 --- /dev/null +++ b/org.eclipse.modisco.releng.tycho/.launches/Build MoDisco Promote Test.launch @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> + <intAttribute key="M2_COLORS" value="0"/> + <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> + <stringAttribute key="M2_GOALS" value="clean verify"/> + <booleanAttribute key="M2_NON_RECURSIVE" value="false"/> + <booleanAttribute key="M2_OFFLINE" value="false"/> + <stringAttribute key="M2_PROFILES" value=""/> + <listAttribute key="M2_PROPERTIES"> + <listEntry value="BUILD_TYPE=nightly"/> + <listEntry value="BUILD_ROOT=C:/Temp/modisco-sync"/> + <listEntry value="BUILD_PROMOTE=E:\GIT\org.eclipse.modisco\releng\org.eclipse.modisco.promote/../../org.eclipse.modisco.updatesite/target/repository"/> + <listEntry value="BUILD_REMOTE=-mapping dummyRemote->dummyRemote"/> + <listEntry value="BUILD_COMMIT=-mapping dummyCommit->dummyCommit"/> + </listAttribute> + <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> + <booleanAttribute key="M2_SKIP_TESTS" value="false"/> + <intAttribute key="M2_THREADS" value="1"/> + <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> + <stringAttribute key="M2_USER_SETTINGS" value=""/> + <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/> + <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.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.modisco.promote}"/> +</launchConfiguration> diff --git a/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Nightly.launch b/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Nightly.launch index 788bb0e72..1d93f7c4e 100644 --- a/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Nightly.launch +++ b/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Nightly.launch @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean verify"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="nightly"/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<stringAttribute key="M2_USER_SETTINGS" value=""/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="bad_container_name" value="\org.eclipse.modisc.releng.tycho"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-<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.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.modisco.releng.tycho}"/>
+ <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+ <stringAttribute key="M2_GOALS" value="clean verify"/>
+ <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+ <booleanAttribute key="M2_OFFLINE" value="false"/>
+ <stringAttribute key="M2_PROFILES" value="nightly"/>
+ <listAttribute key="M2_PROPERTIES"/>
+ <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+ <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+ <intAttribute key="M2_THREADS" value="1"/>
+ <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+ <stringAttribute key="M2_USER_SETTINGS" value=""/>
+ <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+ <stringAttribute key="bad_container_name" value="\org.eclipse.modisc.releng.tycho"/>
+ <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+ <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+ <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.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.modisco.releng.tycho}"/>
</launchConfiguration>
diff --git a/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Stable.launch b/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Stable.launch index ea633fae7..547589f9a 100644 --- a/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Stable.launch +++ b/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Stable.launch @@ -16,6 +16,6 @@ <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-<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.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.modisco.releng.tycho}"/>
</launchConfiguration>
diff --git a/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Versions.launch b/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Versions.launch index 0689ddd29..48a8ab5c0 100644 --- a/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Versions.launch +++ b/org.eclipse.modisco.releng.tycho/.launches/Build Modisco - Versions.launch @@ -16,6 +16,6 @@ <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-<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.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.modisco.releng.tycho}"/>
</launchConfiguration>
diff --git a/org.eclipse.modisco.releng.tycho/.launches/JustJ for MoDisco.launch b/org.eclipse.modisco.releng.tycho/.launches/JustJ for MoDisco.launch new file mode 100644 index 000000000..9a05c5a80 --- /dev/null +++ b/org.eclipse.modisco.releng.tycho/.launches/JustJ for MoDisco.launch @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> + <booleanAttribute key="append.args" value="true"/> + <stringAttribute key="application" value="org.eclipse.justj.p2.manager"/> + <booleanAttribute key="askclear" value="true"/> + <booleanAttribute key="automaticAdd" value="true"/> + <booleanAttribute key="automaticValidate" value="true"/> + <stringAttribute key="bootstrap" value=""/> + <stringAttribute key="checked" value="[NONE]"/> + <booleanAttribute key="clearConfig" value="true"/> + <booleanAttribute key="clearws" value="false"/> + <booleanAttribute key="clearwslog" value="false"/> + <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JustJ for MoDisco"/> + <booleanAttribute key="default" value="true"/> + <booleanAttribute key="includeOptional" value="true"/> + <stringAttribute key="location" value="${workspace_loc}/../runtime-JustJforQVTo"/> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/> + <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-17"/> + <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -retain 50 -label MoDisco -build-url https://ci.eclipse.org/qvt-oml/job/modisco-master/lastSuccessfulBuild -root C:/Temp/modisco-sync -relative builds -version-iu org.eclipse.modisco.sdk.feature.group -target-url https://download.eclipse.org/modeling/mdt/modisco -promote https://ci.eclipse.org/modisco/job/modisco-master/lastSuccessfulBuild/artifact/org.eclipse.modisco.updatesite/target/repository -type nightly -breadcrumb MoDisco https://projects.eclipse.org/projects/modeling.mdt.modisco"/> + <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> + <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true"/> + <stringAttribute key="pde.version" value="3.3"/> + <stringAttribute key="product" value="org.eclipse.sdk.ide"/> + <booleanAttribute key="show_selected_only" value="false"/> + <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> + <booleanAttribute key="tracing" value="false"/> + <booleanAttribute key="useCustomFeatures" value="false"/> + <booleanAttribute key="useDefaultConfig" value="true"/> + <booleanAttribute key="useDefaultConfigArea" value="true"/> + <booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> diff --git a/org.eclipse.modisco.releng.tycho/.launches/JustJ for QVTo.launch b/org.eclipse.modisco.releng.tycho/.launches/JustJ for QVTo.launch new file mode 100644 index 000000000..25982d20a --- /dev/null +++ b/org.eclipse.modisco.releng.tycho/.launches/JustJ for QVTo.launch @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> + <booleanAttribute key="append.args" value="true"/> + <stringAttribute key="application" value="org.eclipse.justj.p2.manager"/> + <booleanAttribute key="askclear" value="true"/> + <booleanAttribute key="automaticAdd" value="true"/> + <booleanAttribute key="automaticValidate" value="true"/> + <stringAttribute key="bootstrap" value=""/> + <stringAttribute key="checked" value="[NONE]"/> + <booleanAttribute key="clearConfig" value="true"/> + <booleanAttribute key="clearws" value="false"/> + <booleanAttribute key="clearwslog" value="false"/> + <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JustJ for QVTo"/> + <booleanAttribute key="default" value="true"/> + <booleanAttribute key="includeOptional" value="true"/> + <stringAttribute key="location" value="${workspace_loc}/../runtime-JustJforQVTo"/> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/> + <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-17"/> + <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -retain 50 -label QVTo -build-url https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7/ -root C:/Temp/qvto-sync -relative builds -version-iu org.eclipse.m2m.qvt.oml.sdk.feature.group -target-url https://download.eclipse.org/mmt/qvto -promote E:\GIT\org.eclipse.qvto\releng\org.eclipse.qvto.releng.promote/../org.eclipse.qvto.releng.build-site/target/repository -type milestone -breadcrumb QVTo https://projects.eclipse.org/projects/modeling.mmt.qvt-oml/downloads"/> + <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> + <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true"/> + <stringAttribute key="pde.version" value="3.3"/> + <stringAttribute key="product" value="org.eclipse.sdk.ide"/> + <booleanAttribute key="show_selected_only" value="false"/> + <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> + <booleanAttribute key="tracing" value="false"/> + <booleanAttribute key="useCustomFeatures" value="false"/> + <booleanAttribute key="useDefaultConfig" value="true"/> + <booleanAttribute key="useDefaultConfigArea" value="true"/> + <booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> diff --git a/org.eclipse.modisco.releng.tycho/README.txt b/org.eclipse.modisco.releng.tycho/README.txt index e47526b94..5259b50b0 100644 --- a/org.eclipse.modisco.releng.tycho/README.txt +++ b/org.eclipse.modisco.releng.tycho/README.txt @@ -4,19 +4,19 @@ The Tycho build minimises the need for shell activity by auto-registering in P2 The qvtd.aggrcon file is in the ssh://'committer-name'@git.eclipse.org:29418/simrel/org.eclipse.simrel.build.git repo. The updates can be checked by looking for the new entry on https://www.eclipse.org/mmt/downloads/?project=qvtd -or installing new software from e.g. http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/0.20.0/S201408191819 -or installing new software from e.g. http://download.eclipse.org/modeling/mdt/ocl/updates/releases/0.20.0 +or installing new software from e.g. http://download.eclipse.org/modeling/mdt/modisco/updates/milestones/0.20.0/S201408191819 +or installing new software from e.g. http://download.eclipse.org/modeling/mdt/modisco/updates/releases/0.20.0 A new milestone build was formerly manually added to the composite repository by: logon to build.eclipse.org -cd ~/downloads/modeling/mdt/ocl/updates/milestones/0.20.0 +cd ~/downloads/modeling/mdt/modisco/updates/milestones/0.20.0 ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=S201408191819 -Dcomposite.name="QVTd 0.20.0 milestones" The SimRel aggregator is configured by GIT\org.eclipse.simrel.build\qvtd.aggrcon to use an explicit milestone entry So edit qvtd.aggrcon to update -location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/0.20.0/S201408191819" +location="https://download.eclipse.org/modeling/mdt/modisco/updates/milestones/0.20.0/S201408191819" commit with a comment such as [qvtd] 3.10.0M1 for 2019-09 and Push to Gerrit (refs/for/master) The Push dialog identifies a Gerrit such as https://git.eclipse.org/r/149210 Open the Gerrit, Open the Buld job and its console @@ -26,23 +26,23 @@ Refresh RC builds are just aliases for regular S builds. The final R build rebuilds the final RC build and is built as late as possible for contribution to the final SimRel build. For the R build update qvtd.aggrcon to -location="http://download.eclipse.org/modeling/mdt/ocl/updates/releases/3.10.0" +location="http://download.eclipse.org/modeling/mdt/modisco/updates/releases/3.10.0" After a few hours the mirrors can be checked by: -https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/ocl/updates/releases/0.20.0&format=xml +https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/modisco/updates/releases/0.20.0&format=xml Disable the Promoter job until GIT has been updated for the next release number. After each first repo contribution, remember to update the aggregates e.g. -cd ~/downloads/modeling/mdt/ocl/updates/milestones +cd ~/downloads/modeling/mdt/modisco/updates/milestones ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=0.20.0 Downloads are accessible at -cd ~/downloads/modeling/mdt/ocl/downloads/drops/0.20.0 +cd ~/downloads/modeling/mdt/modisco/downloads/drops/0.20.0 Archives are accessible at -cd /home/data/httpd/archive.eclipse.org/modeling/mdt/ocl/downloads/drops -cd /home/data/httpd/archive.eclipse.org/modeling/mdt/ocl/updates/releases +cd /home/data/httpd/archive.eclipse.org/modeling/mdt/modisco/downloads/drops +cd /home/data/httpd/archive.eclipse.org/modeling/mdt/modisco/updates/releases -------- Jenkins config: @@ -72,28 +72,31 @@ Trigger Promoter when stable using releng/org.eclipse.qvtd.releng.build-site/tar --- Drops maintenance -ssh genie.modisco@projects-storage.eclipse.org ls -la /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/downloads/drops/0.20.0 -ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/downloads/drops/0.20.0/N201909* +-- Drops maintenance -- https://download.eclipse.org/modeling/mdt/modisco/downloads/drops +ssh genie.modisco@projects-storage.eclipse.org ls -la /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/downloads/drops/1.5.2 +ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/downloads/drops/1.5.2/N201909* --- Updates maintenance -ssh genie.modisco@projects-storage.eclipse.org ls -la /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/releases -ssh genie.modisco@projects-storage.eclipse.org pwd ; cd /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/releases ; pwd ; ls -la -ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/releases ; ant -f /shared/modeling/tools/promotion/manage-composite.xml remove -Dchild.repository=0.14.0 -ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/releases/0.14.0 +-- Updates maintenance -- https://download.eclipse.org/modeling/mdt/modisco/updates +ssh genie.modisco@projects-storage.eclipse.org ls -la /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/releases +ssh genie.modisco@projects-storage.eclipse.org pwd ; cd /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/releases ; pwd ; ls -la +ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/releases ; export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest ; java -version ; /shared/common/apache-ant-latest/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml remove -Dchild.repository=0.14.0 +ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/releases/0.14.0 -ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly ; ant -f /shared/modeling/tools/promotion/manage-composite.xml remove -Dchild.repository=0.20.0 -ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/0.20.0 +ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/milestones ; export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest ; java -version ; /shared/common/apache-ant-latest/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml remove -Dchild.repository=0.20.0 +ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/milestones/0.20.0 +ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/nightly ; export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest ; java -version ; /shared/common/apache-ant-latest/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml remove -Dchild.repository=0.20.0 +ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/nightly/0.20.0 --- Drops archiving ---- and edit GIT\mmt\downloads\extras-qvto.php -ssh genie.modisco@projects-storage.eclipse.org ls -la /home/data/httpd/archive.eclipse.org/modeling/mdt/ocl/downloads/drops -ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/downloads/drops ; mv 0.14.0 /home/data/httpd/archive.eclipse.org/modeling/mdt/ocl/downloads/drops + +-- Drops archiving -- https://archive.eclipse.org/modeling/mdt/modisco/downloads/drops ---- and edit GIT\mdt\downloads\extras-modisco.php +ssh genie.modisco@projects-storage.eclipse.org ls -la /home/data/httpd/archive.eclipse.org/modeling/mdt/modisco/downloads/drops +ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/downloads/drops ; mv 0.14.0 /home/data/httpd/archive.eclipse.org/modeling/mdt/modisco/downloads/drops -- Updates archiving -ssh genie.modisco@projects-storage.eclipse.org ls -la /home/data/httpd/archive.eclipse.org/modeling/mdt/ocl/updates/releases -ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/archive.eclipse.org/modeling/mdt/ocl/updates/releases/zz* +ssh genie.modisco@projects-storage.eclipse.org ls -la /home/data/httpd/archive.eclipse.org/modeling/mdt/modisco/updates/releases +ssh genie.modisco@projects-storage.eclipse.org rm -rf /home/data/httpd/archive.eclipse.org/modeling/mdt/modisco/updates/releases/zz* -ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/releases ; ant -f /shared/modeling/tools/promotion/manage-composite.xml remove -Dchild.repository=0.14.0 -ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/releases ; mv 0.14.0 /home/data/httpd/archive.eclipse.org/modeling/mdt/ocl/updates/releases -ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/archive.eclipse.org/modeling/mdt/ocl/updates/releases ; ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=0.14.0 +ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/releases ; export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest ; java -version ; /shared/common/apache-ant-latest/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml remove -Dchild.repository=0.14.0 +ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/download.eclipse.org/modeling/mdt/modisco/updates/releases ; mv 0.14.0 /home/data/httpd/archive.eclipse.org/modeling/mdt/modisco/updates/releases +ssh genie.modisco@projects-storage.eclipse.org cd /home/data/httpd/archive.eclipse.org/modeling/mdt/modisco/updates/releases ; export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest ; java -version ; /shared/common/apache-ant-latest/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=0.14.0 diff --git a/org.eclipse.modisco.releng.tycho/pom.xml b/org.eclipse.modisco.releng.tycho/pom.xml index 5e6b1d4ee..36b0449c8 100644 --- a/org.eclipse.modisco.releng.tycho/pom.xml +++ b/org.eclipse.modisco.releng.tycho/pom.xml @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.modisco</groupId> <artifactId>org.eclipse.modisco.releng.tycho</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <packaging>pom</packaging> <licenses> <license> @@ -46,25 +46,26 @@ <!-- plugin versions --> <!-- use the "Build Modisco - Versions" launch to check for the latest --> - <eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version> - <exec-maven-version>3.0.0</exec-maven-version> + <eclipse-jarsigner-version>1.4.3</eclipse-jarsigner-version> + <exec-maven-version>3.1.1</exec-maven-version> <findbugs-maven-version>3.0.0</findbugs-maven-version> - <jacoco-maven-version>0.8.17</jacoco-maven-version> - <maven-antrun-version>3.0.0</maven-antrun-version> - <maven-assembly-version>3.3.0</maven-assembly-version> - <maven-checkstyle-version>3.1.1</maven-checkstyle-version> - <maven-clean-version>3.1.0</maven-clean-version> - <maven-compiler-version>3.8.1</maven-compiler-version> - <maven-deploy-version>3.0.0-M1</maven-deploy-version> - <maven-enforcer-version>3.0.0-M3</maven-enforcer-version> - <maven-install-version>3.0.0-M1</maven-install-version> - <maven-jar-version>3.2.0</maven-jar-version> - <maven-jxr-version>3.0.0</maven-jxr-version> - <maven-pmd-version>3.13.0</maven-pmd-version> - <maven-resources-version>3.2.0</maven-resources-version> - <maven-site-version>3.9.1</maven-site-version> - <maven-surefire-version>3.0.0-M5</maven-surefire-version> - <tycho-version>2.1.0</tycho-version> + <jacoco-maven-version>0.8.11</jacoco-maven-version> + <maven-antrun-version>3.1.0</maven-antrun-version> + <maven-assembly-version>3.6.0</maven-assembly-version> + <maven-checkstyle-version>3.3.1</maven-checkstyle-version> + <maven-clean-version>3.3.2</maven-clean-version> + <maven-compiler-version>3.11.0</maven-compiler-version> + <maven-deploy-version>3.1.1</maven-deploy-version> + <maven-enforcer-version>3.4.1</maven-enforcer-version> + <maven-failsafe-version>3.2.3</maven-failsafe-version> + <maven-install-version>3.1.1</maven-install-version> + <maven-jar-version>3.3.0</maven-jar-version> + <maven-jxr-version>3.3.1</maven-jxr-version> + <maven-pmd-version>3.21.2</maven-pmd-version> + <maven-resources-version>3.3.1</maven-resources-version> + <maven-site-version>4.0.0-M12</maven-site-version> + <maven-surefire-version>3.2.3</maven-surefire-version> + <tycho-version>4.0.4</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <BUILD_ALIAS></BUILD_ALIAS> @@ -95,7 +96,7 @@ <configuration> <rules> <requireMavenVersion> - <version>3.6.3</version> + <version>3.9.0</version> </requireMavenVersion> <!--requireJavaVersion> <version>1.5</version> @@ -115,14 +116,13 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> - <resolver>p2</resolver> + <!--resolver>p2</resolver--> <!--executionEnvironment>JavaSE-1.8</executionEnvironment--> <target> <artifact> <groupId>org.eclipse.modisco</groupId> <artifactId>org.eclipse.modisco.releng.tycho</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <classifier>${targetPlatform}</classifier> </artifact> </target> @@ -209,23 +209,10 @@ <goal>plugin-source</goal> </goals> </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras-version}</version> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - </archive> - </configuration> - <executions> <execution> - <id>source-feature</id> - <phase>package</phase> + <id>feature-source</id> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> </execution> </executions> @@ -327,16 +314,6 @@ <version>${tycho-version}</version> </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - </plugin> - <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> <version>${eclipse-jarsigner-version}</version> @@ -476,6 +453,16 @@ </properties> </profile> <profile> + <id>milestone</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <buildType>S</buildType> + <targetPlatform>targetPlatforms/stable</targetPlatform> + </properties> + </profile> + <profile> <id>stable</id> <activation> <activeByDefault>false</activeByDefault> @@ -484,13 +471,6 @@ <buildType>S</buildType> <targetPlatform>targetPlatforms/stable</targetPlatform> </properties> - <!--properties> - <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url> - <!- - jdt.core and jdt.compiler.apt should "match", come from same build, and be signed - by same certificate. See bug 462783. - -> - <cbi-jdt-version>3.14.0.v20170830-0152</cbi-jdt-version> - <cbi-jdt-apt-version>1.3.0.v20170502-0408</cbi-jdt-apt-version> - </properties--> </profile> <profile> <id>release</id> @@ -554,19 +534,6 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> <executions> @@ -583,19 +550,6 @@ </executions> </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-plugin</artifactId> <executions> diff --git a/org.eclipse.modisco.releng.tycho/targetPlatforms/nightly.target b/org.eclipse.modisco.releng.tycho/targetPlatforms/nightly.target index d2c05a4c3..53eb31045 100644 --- a/org.eclipse.modisco.releng.tycho/targetPlatforms/nightly.target +++ b/org.eclipse.modisco.releng.tycho/targetPlatforms/nightly.target @@ -3,15 +3,17 @@ <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/> + <repository location="https://download.eclipse.org/releases/latest"/> <!--repository location="https://download.eclipse.org/eclipse/updates/I-builds"/--> - <repository location="https://download.eclipse.org/releases/2020-12/202011061000"/> + <!--repository location="https://download.eclipse.org/releases/2020-12/202011061000"/--> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.acceleo.runtime.feature.group" version="0.0.0"/> <repository location="https://download.eclipse.org/acceleo/updates/releases/3.7/R202002210922"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> - <unit id="org.eclipse.m2m.atl.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.m2m.atl.emftvm.feature.group" version="0.0.0"/> + <unit id="org.eclipse.m2m.atl.feature.group" version="0.0.0"/> <repository location="https://download.eclipse.org/mmt/atl/updates/releases/latest"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -64,7 +66,8 @@ </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.gmf.feature.group" version="0.0.0"/> - <!--repository location="https://download.eclipse.org/modeling/emf/validation/updates/interim"/--> + <repository location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> + <repository location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> <repository location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202004160913"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -85,9 +88,18 @@ <repository location="https://download.eclipse.org/cbi/updates/license"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> - <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> - <unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/> + <unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/> + <unit id="org.antlr.runtime.source" version="3.2.0.v20230929-1400"/> <unit id="org.apache.commons.cli" version="0.0.0"/> + <unit id="org.apache.log4j" version="0.0.0"/> + <unit id="org.hamcrest" version="0.0.0"/> + <!--unit id="org.slf4j.api" version="0.0.0"/--> + <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-I"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R"/> + </location> + <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> + <unit id="javax.annotation" version="0.0.0"/> <unit id="org.apache.lucene" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.source" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/> @@ -96,12 +108,9 @@ <unit id="org.apache.lucene.misc.source" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.queries" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.queries.source" version="3.5.0.v20120725-1805"/> - <unit id="org.hamcrest" version="0.0.0"/> <unit id="org.prefuse" version="0.0.0"/> <unit id="org.prefuse.source" version="0.0.0"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-I"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> </location> </locations> </target> diff --git a/org.eclipse.modisco.releng.tycho/targetPlatforms/stable.target b/org.eclipse.modisco.releng.tycho/targetPlatforms/stable.target index f55627ffd..1574d2302 100644 --- a/org.eclipse.modisco.releng.tycho/targetPlatforms/stable.target +++ b/org.eclipse.modisco.releng.tycho/targetPlatforms/stable.target @@ -5,7 +5,8 @@ <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.acceleo.runtime.feature.group" version="0.0.0"/> - <unit id="org.eclipse.m2m.atl.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.m2m.atl.emftvm.feature.group" version="0.0.0"/> + <unit id="org.eclipse.m2m.atl.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/> @@ -24,10 +25,10 @@ <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/> <!--unit id="org.eclipse.birt.chart.feature.group" version="0.0.0"/--> <repository location="https://download.eclipse.org/releases/latest"/> - <repository location="https://download.eclipse.org/acceleo/updates/releases/3.7/R202002210922"/> + <repository location="https://download.eclipse.org/acceleo/updates/releases/3.7/R202102190929"/> <repository location="https://download.eclipse.org/mmt/atl/updates/releases/latest"/> <!--repository location="https://download.eclipse.org/birt/update-site/4.6/"/--> - <repository location="http://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository location="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/> <repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/latest"/> <repository location="https://download.eclipse.org/technology/swtbot/releases/latest"/> @@ -46,9 +47,17 @@ <repository location="https://download.eclipse.org/cbi/updates/license"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> - <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> - <unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/> + <unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/> + <unit id="org.antlr.runtime.source" version="3.2.0.v20230929-1400"/> <unit id="org.apache.commons.cli" version="0.0.0"/> + <unit id="org.apache.log4j" version="0.0.0"/> + <unit id="org.hamcrest" version="0.0.0"/> + <!--unit id="org.slf4j.api" version="0.0.0"/--> + <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R"/> + </location> + <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> + <unit id="javax.annotation" version="0.0.0"/> <unit id="org.apache.lucene" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.source" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/> @@ -57,11 +66,9 @@ <unit id="org.apache.lucene.misc.source" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.queries" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.queries.source" version="3.5.0.v20120725-1805"/> - <unit id="org.hamcrest" version="0.0.0"/> <unit id="org.prefuse" version="0.0.0"/> <unit id="org.prefuse.source" version="0.0.0"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> </location> </locations> </target> diff --git a/org.eclipse.modisco.releng.tycho/targetPlatforms/unspecified.target b/org.eclipse.modisco.releng.tycho/targetPlatforms/unspecified.target index 954c15624..1f857d178 100644 --- a/org.eclipse.modisco.releng.tycho/targetPlatforms/unspecified.target +++ b/org.eclipse.modisco.releng.tycho/targetPlatforms/unspecified.target @@ -8,7 +8,8 @@ <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.acceleo.runtime.feature.group" version="0.0.0"/> - <unit id="org.eclipse.m2m.atl.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.m2m.atl.emftvm.feature.group" version="0.0.0"/> + <unit id="org.eclipse.m2m.atl.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/> @@ -41,9 +42,17 @@ <repository location="https://download.eclipse.org/cbi/updates/license"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> - <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> - <unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/> + <unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/> + <unit id="org.antlr.runtime.source" version="3.2.0.v20230929-1400"/> <unit id="org.apache.commons.cli" version="0.0.0"/> + <unit id="org.apache.log4j" version="0.0.0"/> + <unit id="org.hamcrest" version="0.0.0"/> + <!--unit id="org.slf4j.api" version="0.0.0"/--> + <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R"/> + </location> + <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> + <unit id="javax.annotation" version="0.0.0"/> <unit id="org.apache.lucene" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.source" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/> @@ -52,11 +61,9 @@ <unit id="org.apache.lucene.misc.source" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.queries" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.queries.source" version="3.5.0.v20120725-1805"/> - <unit id="org.hamcrest" version="0.0.0"/> <unit id="org.prefuse" version="0.0.0"/> <unit id="org.prefuse.source" version="0.0.0"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> </location> </locations> </target> diff --git a/org.eclipse.modisco.sdk.feature/feature.xml b/org.eclipse.modisco.sdk.feature/feature.xml index a8f17d129..5768cc41a 100644 --- a/org.eclipse.modisco.sdk.feature/feature.xml +++ b/org.eclipse.modisco.sdk.feature/feature.xml @@ -13,7 +13,7 @@ <feature
id="org.eclipse.modisco.sdk.feature"
label="MoDisco SDK"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.infra.capabilities"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.tests/.classpath b/org.eclipse.modisco.tests/.classpath index eca7bdba8..ca3785c41 100644 --- a/org.eclipse.modisco.tests/.classpath +++ b/org.eclipse.modisco.tests/.classpath @@ -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-1.8"/> - <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="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>
diff --git a/org.eclipse.modisco.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.tests/.settings/org.eclipse.jdt.core.prefs index fdd1f2f08..8fa4b403c 100644 --- a/org.eclipse.modisco.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -80,24 +80,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -153,9 +157,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
@@ -170,11 +177,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -204,6 +212,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -227,12 +237,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -278,6 +292,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -313,8 +329,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -339,4 +358,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/org.eclipse.modisco.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.tests/META-INF/MANIFEST.MF index c5becff71..31a852194 100644 --- a/org.eclipse.modisco.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.tests/META-INF/MANIFEST.MF @@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.workbench, org.eclipse.debug.core, org.eclipse.jface -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.modisco.tests diff --git a/org.eclipse.modisco.tests/MoDisco_AllTestsInUIThread.launch b/org.eclipse.modisco.tests/MoDisco_AllTestsInUIThread.launch index 1782161f1..89497251d 100644 --- a/org.eclipse.modisco.tests/MoDisco_AllTestsInUIThread.launch +++ b/org.eclipse.modisco.tests/MoDisco_AllTestsInUIThread.launch @@ -34,7 +34,7 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-debug options.debug -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.modisco.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1200m -DsuppressRawWhenUnchecked=true -XX:PermSize=128m -XX:MaxPermSize=512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1200m -DsuppressRawWhenUnchecked=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
diff --git a/org.eclipse.modisco.tests/MoDisco_AllTestsNotInUIThread.launch b/org.eclipse.modisco.tests/MoDisco_AllTestsNotInUIThread.launch index 9ed4c13fe..0fd08b9f5 100644 --- a/org.eclipse.modisco.tests/MoDisco_AllTestsNotInUIThread.launch +++ b/org.eclipse.modisco.tests/MoDisco_AllTestsNotInUIThread.launch @@ -28,7 +28,7 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.modisco.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:PermSize=128m -XX:MaxPermSize=512M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1024m -DsuppressRawWhenUnchecked=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="false"/>
diff --git a/org.eclipse.modisco.tests/Rerun org.eclipse.modisco.tests.BundleTest.launch b/org.eclipse.modisco.tests/Rerun org.eclipse.modisco.tests.BundleTest.launch index c5420e0b9..c527bd337 100644 --- a/org.eclipse.modisco.tests/Rerun org.eclipse.modisco.tests.BundleTest.launch +++ b/org.eclipse.modisco.tests/Rerun org.eclipse.modisco.tests.BundleTest.launch @@ -33,7 +33,7 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-debug options.debug -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.modisco.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1200m -DsuppressRawWhenUnchecked=true -XX:PermSize=128m -XX:MaxPermSize=512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1200m -DsuppressRawWhenUnchecked=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
diff --git a/org.eclipse.modisco.tests/pom.xml b/org.eclipse.modisco.tests/pom.xml index a3ef3e317..30282553b 100644 --- a/org.eclipse.modisco.tests/pom.xml +++ b/org.eclipse.modisco.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.thirdparties.feature/feature.xml b/org.eclipse.modisco.thirdparties.feature/feature.xml index a7684e071..372cdb6ff 100644 --- a/org.eclipse.modisco.thirdparties.feature/feature.xml +++ b/org.eclipse.modisco.thirdparties.feature/feature.xml @@ -16,7 +16,7 @@ <feature
id="org.eclipse.modisco.thirdparties"
label="%featureName"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.updatesite/justj-promoter.properties b/org.eclipse.modisco.updatesite/justj-promoter.properties new file mode 100644 index 000000000..4a3410d8f --- /dev/null +++ b/org.eclipse.modisco.updatesite/justj-promoter.properties @@ -0,0 +1,22 @@ +############################################################################### +# Copyright (c) 2024 Willink Transformations and others. +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# E.D.Willink - initial API and implementation +############################################################################### +# MoDisco publisher properties for use by the justj-promoter job: +# +BUILD_COMMIT=-commit https://git.eclipse.org/c/modisco/org.eclipse.modisco.git/commit/?id=${env.GIT_COMMIT} +BUILD_PROMOTE=${env.BUILD_URL}artifact/org.eclipse.modisco.updatesite/target/repository +BUILD_REMOTE=-remote genie.modisco@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/modeling/mdt/modisco +BUILD_ROOT=/home/jenkins/agent/workspace/justj-promoter/justj-sync +BUILD_TIMESTAMP=-timestamp ${buildTimestamp} +BUILD_TYPE=${env.BUILD_TYPE} +BUILD_URL=${env.BUILD_URL} diff --git a/org.eclipse.modisco.updatesite/pom.xml b/org.eclipse.modisco.updatesite/pom.xml index cff4c38ee..01e0cecb7 100644 --- a/org.eclipse.modisco.updatesite/pom.xml +++ b/org.eclipse.modisco.updatesite/pom.xml @@ -19,21 +19,32 @@ <parent> <groupId>org.eclipse.modisco</groupId> <artifactId>org.eclipse.modisco.releng.tycho</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../org.eclipse.modisco.releng.tycho</relativePath> </parent> <groupId>org.eclipse.modisco</groupId> <artifactId>org.eclipse.modisco.updatesite</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <packaging>eclipse-repository</packaging> + <properties> + <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format> + </properties> <build> <resources> <resource> <directory>.</directory> <filtering>true</filtering> <includes> - <include>downloads.sh</include> + <include>justj-promoter.properties</include> <include>publisher.properties</include> + </includes> + </resource> + <resource> + <directory>.</directory> + <filtering>false</filtering> + <includes> + <include>downloads.sh</include> + <include>index.html</include> <include>publish.sh</include> <include>updates.sh</include> </includes> diff --git a/org.eclipse.modisco.updatesite/updates.sh b/org.eclipse.modisco.updatesite/updates.sh index d80feb152..637be23a6 100644 --- a/org.eclipse.modisco.updatesite/updates.sh +++ b/org.eclipse.modisco.updatesite/updates.sh @@ -1,6 +1,6 @@ #!/bin/bash -xv #******************************************************************************* -# Copyright (c) 2018, 2019 Willink Transformations and others. +# Copyright (c) 2018, 2021 Willink Transformations and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at diff --git a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.classpath b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.classpath +++ b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.settings/org.eclipse.jdt.core.prefs index b0b14b861..11265a345 100644 --- a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,10 @@ -#Mon Mar 14 14:51:40 CET 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF index 570843395..20f6a90be 100644 --- a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.ide;bundle-version="3.6.0", org.eclipse.emf.edit.ui;bundle-version="2.6.0", org.eclipse.modisco.infra.prefuse;bundle-version="0.3.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.usecase.modelfilter.dependencies.ui.internal;x-internal:=true, org.eclipse.modisco.usecase.modelfilter.dependencies.ui.internal.editor;x-internal:=true, diff --git a/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml b/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml index 7023be9da..f5d2679b8 100644 --- a/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml +++ b/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.usecase.modelfilter.feature"
label="MoDisco Model Filter"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.classpath b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.classpath +++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.settings/org.eclipse.jdt.core.prefs index 804b8da2f..11265a345 100644 --- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,10 @@ -#Mon Mar 14 14:59:14 CET 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF index 479e3dcae..e4f77d592 100644 --- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.modisco.infra.common.core;bundle-version="0.9.0", org.eclipse.modisco.java.discoverer;bundle-version="0.9.0", org.eclipse.modisco.infra.discovery.core;bundle-version="0.9.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui.internal;x-internal:=true, org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui.internal.editor;x-internal:=true, diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/pom.xml b/org.eclipse.modisco.usecase.modelfilter.tests/pom.xml index 8f0651650..6b12b4cf5 100644 --- a/org.eclipse.modisco.usecase.modelfilter.tests/pom.xml +++ b/org.eclipse.modisco.usecase.modelfilter.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/references/RealTypesExampleRealTypesWithConstants.uml b/org.eclipse.modisco.usecase.modelfilter.tests/references/RealTypesExampleRealTypesWithConstants.uml new file mode 100644 index 000000000..b3b25c08e --- /dev/null +++ b/org.eclipse.modisco.usecase.modelfilter.tests/references/RealTypesExampleRealTypesWithConstants.uml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="ASCII"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_aSpXYD6AEeqcX6gkWIIK4w" name="root model">
+ <packagedElement xmi:type="uml:Model" xmi:id="_aSp-cD6AEeqcX6gkWIIK4w" name="RealTypesExample">
+ <packagedElement xmi:type="uml:Package" xmi:id="_aSqlgD6AEeqcX6gkWIIK4w" name="org" visibility="public">
+ <packagedElement xmi:type="uml:Package" xmi:id="_aSqlgT6AEeqcX6gkWIIK4w" name="eclipse" visibility="public">
+ <packagedElement xmi:type="uml:Package" xmi:id="_aSqlgj6AEeqcX6gkWIIK4w" name="modisco" visibility="public">
+ <packagedElement xmi:type="uml:Package" xmi:id="_aSqlgz6AEeqcX6gkWIIK4w" name="realtypes" visibility="public">
+ <packagedElement xmi:type="uml:Package" xmi:id="_aSqlhD6AEeqcX6gkWIIK4w" name="example" visibility="public">
+ <packagedElement xmi:type="uml:Class" xmi:id="_aS3Z0D6AEeqcX6gkWIIK4w" name="YourImpl" visibility="public">
+ <interfaceRealization xmi:id="_aS9gcD6AEeqcX6gkWIIK4w" client="_aS3Z0D6AEeqcX6gkWIIK4w" supplier="_aTH4gD6AEeqcX6gkWIIK4w" contract="_aTH4gD6AEeqcX6gkWIIK4w"/>
+ <ownedOperation xmi:id="_aTDnED6AEeqcX6gkWIIK4w" name="YourImpl" visibility="public"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Interface" xmi:id="_aTH4gD6AEeqcX6gkWIIK4w" name="YourInterface" visibility="public"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_aTH4gT6AEeqcX6gkWIIK4w" name="Princ" visibility="public">
+ <ownedAttribute xmi:id="_aTS3oD6AEeqcX6gkWIIK4w" name="yourField" visibility="public" type="_aTH4gD6AEeqcX6gkWIIK4w" association="_aTd2wD6AEeqcX6gkWIIK4w">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aTVT4D6AEeqcX6gkWIIK4w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aTWiAD6AEeqcX6gkWIIK4w" value="1"/>
+ </ownedAttribute>
+ <ownedOperation xmi:id="_aTXJED6AEeqcX6gkWIIK4w" name="main" visibility="public">
+ <ownedParameter xmi:id="_aTbagD6AEeqcX6gkWIIK4w" visibility="public" type="_aTkkdT6AEeqcX6gkWIIK4w" direction="return">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aTbagT6AEeqcX6gkWIIK4w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aTbagj6AEeqcX6gkWIIK4w" value="1"/>
+ </ownedParameter>
+ <ownedParameter xmi:id="_aTbagz6AEeqcX6gkWIIK4w" name="args" visibility="public" type="_aTlLgz6AEeqcX6gkWIIK4w">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aTbahD6AEeqcX6gkWIIK4w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aTbahT6AEeqcX6gkWIIK4w" value="*"/>
+ </ownedParameter>
+ </ownedOperation>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_aTd2wD6AEeqcX6gkWIIK4w" memberEnd="_aTS3oD6AEeqcX6gkWIIK4w _aTg6ED6AEeqcX6gkWIIK4w">
+ <ownedEnd xmi:id="_aTg6ED6AEeqcX6gkWIIK4w" type="_aTH4gT6AEeqcX6gkWIIK4w" association="_aTd2wD6AEeqcX6gkWIIK4w"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_aTg6ET6AEeqcX6gkWIIK4w" name="real type" client="_aTd2wD6AEeqcX6gkWIIK4w" supplier="_aS3Z0D6AEeqcX6gkWIIK4w"/>
+ </packagedElement>
+ </packagedElement>
+ </packagedElement>
+ </packagedElement>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Package" xmi:id="_aTg6Ej6AEeqcX6gkWIIK4w" name="Common Java datatypes" visibility="public">
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkcD6AEeqcX6gkWIIK4w" name="int" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkcT6AEeqcX6gkWIIK4w" name="long" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkcj6AEeqcX6gkWIIK4w" name="float" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkcz6AEeqcX6gkWIIK4w" name="double" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkdD6AEeqcX6gkWIIK4w" name="boolean" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkdT6AEeqcX6gkWIIK4w" name="void" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkdj6AEeqcX6gkWIIK4w" name="char" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkdz6AEeqcX6gkWIIK4w" name="short" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkeD6AEeqcX6gkWIIK4w" name="byte" visibility="public"/>
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_aTkkeT6AEeqcX6gkWIIK4w" name="string" visibility="public"/>
+ </packagedElement>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Model" xmi:id="_aTlLgD6AEeqcX6gkWIIK4w" name="externals">
+ <packagedElement xmi:type="uml:Package" xmi:id="_aTlLgT6AEeqcX6gkWIIK4w" name="java" visibility="public">
+ <packagedElement xmi:type="uml:Package" xmi:id="_aTlLgj6AEeqcX6gkWIIK4w" name="lang" visibility="public">
+ <packagedElement xsi:type="uml:Package" name="constant" visibility="public">
+ <packagedElement xsi:type="uml:Interface" name="Constable" visibility="public"/>
+ <packagedElement xsi:type="uml:Interface" name="ConstantDesc" visibility="public"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_aTlLgz6AEeqcX6gkWIIK4w" name="String" visibility="public">
+ <interfaceRealization xmi:id="_aTlLhD6AEeqcX6gkWIIK4w" client="_aTlLgz6AEeqcX6gkWIIK4w" supplier="_aTtuYz6AEeqcX6gkWIIK4w" contract="_aTtuYz6AEeqcX6gkWIIK4w"/>
+ <interfaceRealization xmi:id="_aTlLhT6AEeqcX6gkWIIK4w" client="_aTlLgz6AEeqcX6gkWIIK4w" supplier="_aTlLhz6AEeqcX6gkWIIK4w" contract="_aTlLhz6AEeqcX6gkWIIK4w"/>
+ <interfaceRealization xmi:id="_aTlLhj6AEeqcX6gkWIIK4w" client="_aTlLgz6AEeqcX6gkWIIK4w" supplier="_aTtuYT6AEeqcX6gkWIIK4w" contract="_aTtuYT6AEeqcX6gkWIIK4w"/>
+ <interfaceRealization client="//externals/java/lang/String" supplier="//externals/java/lang/constant/Constable" contract="//externals/java/lang/constant/Constable"/>
+ <interfaceRealization client="//externals/java/lang/String" supplier="//externals/java/lang/constant/ConstantDesc" contract="//externals/java/lang/constant/ConstantDesc"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Interface" xmi:id="_aTlLhz6AEeqcX6gkWIIK4w" name="Comparable">
+ <ownedTemplateSignature xmi:type="uml:RedefinableTemplateSignature" xmi:id="_aTpc8D6AEeqcX6gkWIIK4w" name="Comparable<T>" parameter="_aTtHUD6AEeqcX6gkWIIK4w">
+ <ownedParameter xmi:type="uml:ClassifierTemplateParameter" xmi:id="_aTtHUD6AEeqcX6gkWIIK4w" parameteredElement="_aTtuYD6AEeqcX6gkWIIK4w">
+ <ownedParameteredElement xmi:type="uml:Class" xmi:id="_aTtuYD6AEeqcX6gkWIIK4w" name="T" templateParameter="_aTtHUD6AEeqcX6gkWIIK4w"/>
+ </ownedParameter>
+ </ownedTemplateSignature>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Interface" xmi:id="_aTtuYT6AEeqcX6gkWIIK4w" name="CharSequence" visibility="public"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Package" xmi:id="_aTtuYj6AEeqcX6gkWIIK4w" name="io" visibility="public">
+ <packagedElement xmi:type="uml:Interface" xmi:id="_aTtuYz6AEeqcX6gkWIIK4w" name="Serializable" visibility="public"/>
+ </packagedElement>
+ </packagedElement>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Model" xmi:id="_aTtuZD6AEeqcX6gkWIIK4w" name="source references">
+ <packagedElement xmi:type="uml:Artifact" xmi:id="_aTwxsD6AEeqcX6gkWIIK4w" name="YourImpl.java" visibility="public" fileName="D:\_eclipse\com.mia.itmf.dev.eclipsepackage-1.8.0.201910171512\junit-workspace\RealTypesExample\src\org\eclipse\modisco\realtypes\example\YourImpl.java"/>
+ <packagedElement xmi:type="uml:Artifact" xmi:id="_aTwxsT6AEeqcX6gkWIIK4w" name="YourInterface.java" visibility="public" fileName="D:\_eclipse\com.mia.itmf.dev.eclipsepackage-1.8.0.201910171512\junit-workspace\RealTypesExample\src\org\eclipse\modisco\realtypes\example\YourInterface.java"/>
+ <packagedElement xmi:type="uml:Artifact" xmi:id="_aTwxsj6AEeqcX6gkWIIK4w" name="Princ.java" visibility="public" fileName="D:\_eclipse\com.mia.itmf.dev.eclipsepackage-1.8.0.201910171512\junit-workspace\RealTypesExample\src\org\eclipse\modisco\realtypes\example\Princ.java"/>
+ </packagedElement>
+</uml:Model>
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java index 3b7db2a6c..6ad30256a 100644 --- a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java +++ b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java @@ -1,5 +1,5 @@ /*
- * Copyright (c) 2010, 2019 Mia-Software and others.
+ * Copyright (c) 2010, 2023 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -129,13 +129,23 @@ public class SimpleBlackBoxDiscovery { * discovered java code, we have to unset them before comparison
*/
unsetFilenames(output);
- final String referencePath = "/" + Activator.PLUGIN_ID + REF_FOLDER_PATH + PROJECT_NAME //$NON-NLS-1$
- + "RealTypes" + UML_MODEL_EXT; //$NON-NLS-1$
+ String referencePathStem = "/" + Activator.PLUGIN_ID + REF_FOLDER_PATH + PROJECT_NAME //$NON-NLS-1$
+ + "RealTypes"; //$NON-NLS-1$
+ try { // Bug 582651 Java 12 adds java.lang.constant
+ Class.forName("java.lang.constant.Constable");
+ referencePathStem += "WithConstants";
+ } catch (ClassNotFoundException e) {
+ }
+ final String referencePath = referencePathStem + UML_MODEL_EXT; //$NON-NLS-1$
final URI referenceUri = URI.createPlatformPluginURI(referencePath, true);
Assert.assertNotNull(referenceUri);
final Resource referenceModel = ModelUtils.loadModel(referenceUri);
Assert.assertNotNull(referenceModel);
unsetFilenames(referenceModel);
+ // output.setURI(URI.createURI("test.xml"));
+ // output.save(null);
+ UMLNormalizer.INSTANCE.normalize(referenceModel);
+ UMLNormalizer.INSTANCE.normalize(output);
final boolean result = TestModelUtils.compareModels(referenceModel, output);
Assert.assertTrue(
"Comparison of Uml models with real types has failed !", result); //$NON-NLS-1$
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/UMLNormalizer.java b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/UMLNormalizer.java new file mode 100644 index 000000000..8bf3c8fd0 --- /dev/null +++ b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/UMLNormalizer.java @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2022 Willink Transformations and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v20.html + * + * Contributors: + * E.D.Willink - Initial API and implementation + */ +package org.eclipse.modisco.usecase.modelfilter.tests; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +import org.eclipse.emf.common.util.ECollections; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.common.util.TreeIterator; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.uml2.uml.PackageableElement; + +/** + * Ensure that compared UML models have determinstic Package.packagedElement order. See Bug 580945. + */ +public class UMLNormalizer //implements ModelNormalizer +{ + public static interface Normalizer { + void denormalize(); + void normalize(); + } + + public static final UMLNormalizer INSTANCE = new UMLNormalizer(); + + protected static class PackageableElementComparator implements Comparator<PackageableElement> + { + public int compare(PackageableElement o1, PackageableElement o2) { + String cn1 = o1.eClass().getName(); + String cn2 = o2.eClass().getName(); + int diff = cn1.compareTo(cn2); + if (diff != 0) { + return diff; + } + String n1 = o1.getName(); + String n2 = o2.getName(); + return n1.compareTo(n2); + } + } + + public List<Normalizer> normalize(Resource resource) { + PackageableElementComparator packageableElementComparator = new PackageableElementComparator(); + List<org.eclipse.uml2.uml.Package> umlPackages = new ArrayList<org.eclipse.uml2.uml.Package>(); + for (TreeIterator<EObject> tit = resource.getAllContents(); tit.hasNext(); ) { + EObject eObject = tit.next(); + if (eObject instanceof org.eclipse.uml2.uml.Package) { + umlPackages.add((org.eclipse.uml2.uml.Package)eObject); + } + } + for (org.eclipse.uml2.uml.Package umlPackage : umlPackages) { + @SuppressWarnings("unchecked") + EList<PackageableElement> children = umlPackage.getPackagedElements(); + ECollections.sort(children, packageableElementComparator); + } + List<Normalizer> normalizers = new ArrayList<Normalizer>(); + return normalizers; + } +}
\ No newline at end of file diff --git a/org.eclipse.modisco.usecase.modelfilter/src/org/eclipse/modisco/usecase/modelfilter/DiscoverUmlModelWithRealTypesFromJavaProject.java b/org.eclipse.modisco.usecase.modelfilter/src/org/eclipse/modisco/usecase/modelfilter/DiscoverUmlModelWithRealTypesFromJavaProject.java index 13536702f..e5e6ed1c7 100644 --- a/org.eclipse.modisco.usecase.modelfilter/src/org/eclipse/modisco/usecase/modelfilter/DiscoverUmlModelWithRealTypesFromJavaProject.java +++ b/org.eclipse.modisco.usecase.modelfilter/src/org/eclipse/modisco/usecase/modelfilter/DiscoverUmlModelWithRealTypesFromJavaProject.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2009, 2019 Mia-Software and others.
+ * Copyright (c) 2009, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml b/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml index 73d6bd0a8..0d257dd57 100644 --- a/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml +++ b/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.usecase.simpletransformationschain.feature"
label="MoDisco Simple transformations chain"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelFromJavaProject.java b/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelFromJavaProject.java index cd5cac2be..7155007c0 100644 --- a/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelFromJavaProject.java +++ b/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelFromJavaProject.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2009, 2019 Mia-Software and others.
+ * Copyright (c) 2009, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelFromProject.java b/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelFromProject.java index 6ca94b14a..8ed897092 100644 --- a/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelFromProject.java +++ b/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelFromProject.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2019 Mia-Software and others.
+ * Copyright (c) 2011, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject.java b/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject.java index f20fa7936..580814c10 100644 --- a/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject.java +++ b/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2009, 2019 Mia-Software and others.
+ * Copyright (c) 2009, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelWithBidirectionalAssociationsFromProject.java b/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelWithBidirectionalAssociationsFromProject.java index 712a48a49..a979170f0 100644 --- a/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelWithBidirectionalAssociationsFromProject.java +++ b/org.eclipse.modisco.usecase.simpletransformationschain/src/org/eclipse/modisco/usecase/simpletransformationschain/DiscoverUmlModelWithBidirectionalAssociationsFromProject.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2019 Mia-Software and others.
+ * Copyright (c) 2011, 2020 Mia-Software and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.modisco.utils.chart.feature/feature.xml b/org.eclipse.modisco.utils.chart.feature/feature.xml index 8838635cf..52d0bb45f 100644 --- a/org.eclipse.modisco.utils.chart.feature/feature.xml +++ b/org.eclipse.modisco.utils.chart.feature/feature.xml @@ -16,7 +16,7 @@ <feature
id="org.eclipse.modisco.utils.chart.feature"
label="MoDisco Chart Utilities"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.workflow.ui/.classpath b/org.eclipse.modisco.workflow.ui/.classpath index b862a296d..ca3785c41 100644 --- a/org.eclipse.modisco.workflow.ui/.classpath +++ b/org.eclipse.modisco.workflow.ui/.classpath @@ -1,6 +1,6 @@ <?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-1.8"/>
+ <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"/>
diff --git a/org.eclipse.modisco.workflow.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.workflow.ui/.settings/org.eclipse.jdt.core.prefs index 52b5df116..f5e08d4f2 100644 --- a/org.eclipse.modisco.workflow.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.modisco.workflow.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,15 @@ -#Tue Feb 22 11:32:07 CET 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -14,16 +17,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -106,11 +112,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -140,6 +147,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -163,12 +172,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -214,6 +227,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -249,8 +264,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -276,5 +294,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF index 63d588d2d..e47770c78 100644 --- a/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.modisco.infra.common.core;bundle-version="0.9.0", org.eclipse.jdt.core;bundle-version="3.6.0", org.eclipse.ui.ide;bundle-version="3.6.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.modisco.workflow.ui diff --git a/org.eclipse.modisco.xml.discoverer.tests/pom.xml b/org.eclipse.modisco.xml.discoverer.tests/pom.xml index 900ac1f01..47dc678b4 100644 --- a/org.eclipse.modisco.xml.discoverer.tests/pom.xml +++ b/org.eclipse.modisco.xml.discoverer.tests/pom.xml @@ -21,7 +21,7 @@ <parent>
<groupId>org.eclipse.modisco</groupId>
<artifactId>org.eclipse.modisco.releng.tycho</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<relativePath>../org.eclipse.modisco.releng.tycho</relativePath>
</parent>
<groupId>org.eclipse.modisco</groupId>
diff --git a/org.eclipse.modisco.xml.feature/feature.xml b/org.eclipse.modisco.xml.feature/feature.xml index 786267ae2..c30bac9ea 100644 --- a/org.eclipse.modisco.xml.feature/feature.xml +++ b/org.eclipse.modisco.xml.feature/feature.xml @@ -12,7 +12,7 @@ <feature
id="org.eclipse.modisco.xml.feature"
label="MoDisco Xml Feature"
- version="1.5.2.qualifier"
+ version="1.5.5.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.xml"
license-feature="org.eclipse.license"
@@ -6,12 +6,12 @@ <parent> <groupId>org.eclipse.modisco</groupId> <artifactId>org.eclipse.modisco.releng.tycho</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>org.eclipse.modisco.releng.tycho</relativePath> </parent> <groupId>org.eclipse.modisco</groupId> <artifactId>org.eclipse.modisco-folder</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -80,10 +80,6 @@ <module>org.eclipse.modisco.xml.browser.customization</module> <!-- MoDisco Plugins --> - <module>org.eclipse.modisco.doc</module> - <!--module>org.eclipse.modisco.doc.api.report</module> - <module>org.eclipse.modisco.doc.metric.report</module> - <module>org.eclipse.modisco.doc.test.report</module--> <module>org.eclipse.modisco.eclipseplugin</module> <module>org.eclipse.modisco.eclipseplugin.discoverer</module> <module>org.eclipse.modisco.eclipseplugin.discoverer.ui</module> @@ -95,8 +91,6 @@ <module>org.eclipse.modisco.infra.discovery.benchmark.ui</module> <module>org.eclipse.modisco.infra.discovery.core</module> <module>org.eclipse.modisco.infra.discovery.ui</module> - <module>org.eclipse.modisco.infra.omg.doc</module> - <module>org.eclipse.modisco.infrastructure.doc</module> <module>org.eclipse.modisco.java.composition</module> <module>org.eclipse.modisco.java.composition.browser.customization</module> <module>org.eclipse.modisco.java.composition.discoverer</module> @@ -105,9 +99,7 @@ <module>org.eclipse.modisco.java.discoverer</module> <module>org.eclipse.modisco.java.discoverer.cdo</module> <module>org.eclipse.modisco.java.discoverer.ui</module> - <module>org.eclipse.modisco.java.doc</module> <module>org.eclipse.modisco.jee</module> - <module>org.eclipse.modisco.jee.doc</module> <module>org.eclipse.modisco.jee.ejbjar</module> <module>org.eclipse.modisco.jee.ejbjar.discoverer</module> <module>org.eclipse.modisco.jee.ejbjar.discoverer.ui</module> @@ -136,12 +128,10 @@ <module>org.eclipse.modisco.properties.discoverer.ui</module> <module>org.eclipse.modisco.usecase.modelfilter</module> <module>org.eclipse.modisco.usecase.modelfilter.dependencies.ui</module> - <module>org.eclipse.modisco.usecase.modelfilter.doc</module> <module>org.eclipse.modisco.usecase.modelfilter.methodcalls</module> <module>org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer</module> <module>org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui</module> <module>org.eclipse.modisco.usecase.modelfilter.ui</module> - <module>org.eclipse.modisco.usecase.simpletransformationchain.doc</module> <module>org.eclipse.modisco.usecase.simpletransformationschain</module> <module>org.eclipse.modisco.usecase.simpletransformationschain.ui</module> <module>org.eclipse.modisco.util.atl.core</module> @@ -154,7 +144,6 @@ <module>org.eclipse.modisco.workflow.ui</module> <module>org.eclipse.modisco.xml.discoverer</module> <module>org.eclipse.modisco.xml.discoverer.ui</module> - <module>org.eclipse.modisco.xml.doc</module> <!-- Features --> <module>org.eclipse.modisco.all.feature</module> <module>org.eclipse.modisco.eclipse.feature</module> @@ -174,6 +163,18 @@ <module>org.eclipse.modisco.usecase.simpletransformationschain.feature</module> <module>org.eclipse.modisco.utils.chart.feature</module> <module>org.eclipse.modisco.xml.feature</module> + <!-- Doc Plugins --> + <module>org.eclipse.modisco.doc</module> + <!--module>org.eclipse.modisco.doc.api.report</module> + <module>org.eclipse.modisco.doc.metric.report</module> + <module>org.eclipse.modisco.doc.test.report</module--> + <module>org.eclipse.modisco.infra.omg.doc</module> + <module>org.eclipse.modisco.infrastructure.doc</module> + <module>org.eclipse.modisco.java.doc</module> + <module>org.eclipse.modisco.jee.doc</module> + <module>org.eclipse.modisco.usecase.modelfilter.doc</module> + <module>org.eclipse.modisco.usecase.simpletransformationchain.doc</module> + <module>org.eclipse.modisco.xml.doc</module> <!-- Test Support Plugins --> <module>org.eclipse.modisco.common.tests</module> <module>org.eclipse.modisco.facet.util.tests.swtbot</module> @@ -210,7 +211,8 @@ <module>org.eclipse.modisco.tests</module> <module>org.eclipse.modisco.usecase.modelfilter.tests</module> <module>org.eclipse.modisco.xml.discoverer.tests</module> - <!-- Update Site --> + <!--Releng--> + <!--module>org.eclipse.modisco.oomph</module--> <module>org.eclipse.modisco.updatesite</module> </modules> diff --git a/releng/org.eclipse.modisco.oomph/.project b/releng/org.eclipse.modisco.oomph/.project new file mode 100644 index 000000000..97ced19aa --- /dev/null +++ b/releng/org.eclipse.modisco.oomph/.project @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.modisco.oomph</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.modisco.oomph/setups/modisco.setup b/releng/org.eclipse.modisco.oomph/setups/modisco.setup new file mode 100644 index 000000000..f7096e595 --- /dev/null +++ b/releng/org.eclipse.modisco.oomph/setups/modisco.setup @@ -0,0 +1,949 @@ +<?xml version="1.0" encoding="UTF-8"?> +<setup:Project + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0" + xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0" + xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0" + xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0" + xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" + xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" + xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0" + xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" + xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore" + name="modisco" + label="MoDisco"> + <setupTask + xsi:type="jdt:JRETask" + version="JavaSE-17" + location="${jre.location-17}"/> + <setupTask + xsi:type="setup:EclipseIniTask" + option="-Xmx" + value="2048m" + vm="true"/> + <setupTask + xsi:type="setup:EclipseIniTask" + excludedTriggers="STARTUP" + option="-perspective" + value="org.eclipse.jdt.ui.JavaPerspective"/> + <setupTask + xsi:type="setup:ResourceCreationTask" + excludedTriggers="STARTUP MANUAL" + targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml" + encoding="UTF-8"> + <description>Initialize JDT's package explorer to show working sets as its root objects</description> + <content> + <?xml version="1.0" encoding="UTF-8"?> + <section name="Workbench"> + <section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart"> + <item value="true" key="group_libraries"/> + <item value="false" key="linkWithEditor"/> + <item value="2" key="layout"/> + <item value="2" key="rootMode"/> + <item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer configured=&quot;true&quot; group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;2&quot; sortWorkingSets=&quot;false&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;localWorkingSetManager&gt;&#x0D;&#x0A;&lt;workingSet editPageId=&quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1382792884467_1&quot; label=&quot;Other Projects&quot; name=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/localWorkingSetManager&gt;&#x0D;&#x0A;&lt;activeWorkingSet workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;allWorkingSets workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/> + </section> + </section> + + </content> + </setupTask> + <setupTask + xsi:type="setup:VariableTask" + name="eclipse.target.platform" + defaultValue="2022-03" + storageURI="scope://Workspace"/> + <setupTask + xsi:type="setup.p2:P2Task"> + <requirement + name="org.eclipse.jdt.junit4.runtime"/> + <requirement + name="org.eclipse.m2e.feature.feature.group"/> + <description>Mandatory IDE for MoDisco Developers</description> + </setupTask> + <setupTask + xsi:type="setup:CompoundTask" + name="Preferences"> + <setupTask + xsi:type="setup:PreferenceTask" + key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" + value="ignore"/> + <setupTask + xsi:type="setup:PreferenceTask" + key="instance/org.eclipse.epp.mpc.ui/org.eclipse.epp.mpc.naturelookup" + value="false"/> + <setupTask + xsi:type="setup:PreferenceTask" + key="instance/org.eclipse.pde.api.tools/missing_default_api_profile" + value="Ignore"/> + </setupTask> + <setupTask + xsi:type="setup.targlets:TargletTask"> + <targlet + name="${scope.project.root.label} Target Platform" + activeRepositoryList="${eclipse.target.platform}"> + <requirement + name="com.google.guava"/> + <requirement + name="org.antlr.runtime" + versionRange="[3.2.0,3.3.0]"/> + <requirement + name="org.apache.commons.cli"/> + <requirement + name="org.apache.log4j"/> + <requirement + name="org.apache.lucene" + versionRange="[3.5.0.v20120725-1805,3.5.0.v20120725-1805]"/> + <requirement + name="org.apache.lucene.core" + versionRange="[3.5.0.v20120725-1805,3.5.0.v20120725-1805]"/> + <requirement + name="org.apache.lucene.misc" + versionRange="[3.5.0.v20120725-1805,3.5.0.v20120725-1805]"/> + <requirement + name="org.apache.lucene.queries" + versionRange="[3.5.0.v20120725-1805,3.5.0.v20120725-1805]"/> + <requirement + name="org.eclipse.acceleo.feature.group"/> + <requirement + name="org.eclipse.birt.chart.device.extension"/> + <requirement + name="org.eclipse.birt.chart.engine"/> + <requirement + name="org.eclipse.birt.chart.engine.extension"/> + <requirement + name="org.eclipse.emf.cdo.feature.group"/> + <requirement + name="org.eclipse.emf.query.sdk.feature.group"/> + <requirement + name="org.eclipse.emf.sdk.feature.group"/> + <requirement + name="org.eclipse.emf.transaction.sdk.feature.group"/> + <requirement + name="org.eclipse.emf.validation.feature.group"/> + <requirement + name="org.eclipse.m2m.atl.feature.group"/> + <requirement + name="org.eclipse.m2m.atl.emftvm.feature.group"/> + <requirement + name="org.eclipse.net4j.feature.group"/> + <requirement + name="org.eclipse.net4j.db.derby"/> + <requirement + name="org.eclipse.ocl.all.sdk.feature.group"/> + <requirement + name="org.eclipse.sdk.feature.group"/> + <requirement + name="org.eclipse.swtbot.feature.group"/> + <requirement + name="org.eclipse.swtbot.eclipse.feature.group"/> + <requirement + name="org.eclipse.swtbot.ide.feature.group"/> + <requirement + name="org.eclipse.swtbot.eclipse.test.junit.feature.group"/> + <requirement + name="org.eclipse.swtbot.forms.feature.group"/> + <requirement + name="org.eclipse.uml2.sdk.feature.group"/> + <requirement + name="org.hamcrest"/> + <requirement + name="org.prefuse"/> + <repositoryList + name="Latest"> + <repository + url="https://download.eclipse.org/releases/latest"/> + <repository + url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/latest"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2024-03"> + <repository + url="https://download.eclipse.org/releases/2024-03"/> + <repository + url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2023-12"> + <repository + url="https://download.eclipse.org/releases/2023-12"/> + <repository + url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2023-09"> + <repository + url="https://download.eclipse.org/releases/2023-09"/> + <repository + url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2023-06"> + <repository + url="https://download.eclipse.org/releases/2023-06"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2023-03"> + <repository + url="https://download.eclipse.org/releases/2023-03"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2022-12"> + <repository + url="https://download.eclipse.org/releases/2022-12"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2022-09"> + <repository + url="https://download.eclipse.org/releases/2022-09"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2022-06"> + <repository + url="https://download.eclipse.org/releases/2022-06"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2022-03"> + <repository + url="https://download.eclipse.org/releases/2022-03"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2021-12"> + <repository + url="https://download.eclipse.org/releases/2021-12"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.x"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/latest"/> + </repositoryList> + <repositoryList + name="2021-09"> + <repository + url="https://download.eclipse.org/releases/2021-09"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/3.1.0"/> + <repository + url="https://download.eclipse.org/mat/snapshots/update-site"/> + </repositoryList> + <repositoryList + name="2021-06"> + <repository + url="https://download.eclipse.org/releases/2021-06"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/3.1.0"/> + </repositoryList> + <repositoryList + name="2021-03"> + <repository + url="https://download.eclipse.org/releases/2021-03"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/3.0.0"/> + </repositoryList> + <repositoryList + name="2020-12"> + <repository + url="https://download.eclipse.org/releases/2020-12"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/3.0.0"/> + </repositoryList> + <repositoryList + name="2020-09"> + <repository + url="https://download.eclipse.org/releases/2020-09"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/3.0.0"/> + </repositoryList> + <repositoryList + name="2020-06"> + <repository + url="https://download.eclipse.org/releases/2020-06"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/3.0.0"/> + </repositoryList> + <repositoryList + name="2020-03"> + <repository + url="https://download.eclipse.org/releases/2020-03"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.8.0"/> + </repositoryList> + <repositoryList + name="2019-12"> + <repository + url="https://download.eclipse.org/releases/2019-12"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.8.0"/> + </repositoryList> + <repositoryList + name="2019-09"> + <repository + url="https://download.eclipse.org/releases/2019-09"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.8.0"/> + </repositoryList> + <repositoryList + name="2019-06"> + <repository + url="https://download.eclipse.org/releases/2019-06"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.8.0"/> + </repositoryList> + <repositoryList + name="2019-03"> + <repository + url="https://download.eclipse.org/releases/2019-03"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.7.0"/> + </repositoryList> + <repositoryList + name="2018-12"> + <repository + url="https://download.eclipse.org/releases/2018-12"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.7.0"/> + </repositoryList> + <repositoryList + name="2018-09"> + <repository + url="https://download.eclipse.org/releases/2018-09"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.7.0"/> + </repositoryList> + <repositoryList + name="Photon"> + <repository + url="https://download.eclipse.org/releases/photon"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.7.0"/> + </repositoryList> + <repositoryList + name="Oxygen"> + <repository + url="https://download.eclipse.org/releases/oxygen"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.7.0"/> + </repositoryList> + <repositoryList + name="Neon"> + <repository + url="https://download.eclipse.org/releases/neon"/> + <repository + url="https://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.6"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.6.0"/> + </repositoryList> + <repositoryList + name="Mars"> + <repository + url="https://download.eclipse.org/releases/mars"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.5"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.4.0"/> + </repositoryList> + <repositoryList + name="Luna"> + <repository + url="https://download.eclipse.org/releases/luna"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/> + <repository + url="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.4"/> + <repository + url="https://download.eclipse.org/technology/swtbot/releases/2.3.0"/> + </repositoryList> + </targlet> + </setupTask> + <setupTask + xsi:type="git:GitCloneTask" + id="modisco.git.clone" + remoteURI="modisco/org.eclipse.modisco"> + <annotation + source="http://www.eclipse.org/oomph/setup/InducedChoices"> + <detail + key="inherit"> + <value>eclipse.git.gerrit.remoteURIs</value> + </detail> + <detail + key="label"> + <value>MoDisco Git or Gerrit Repository</value> + </detail> + <detail + key="target"> + <value>remoteURI</value> + </detail> + </annotation> + <configSections + name="core"> + <properties + key="autocrlf"/> + </configSections> + <description>MoDisco Git repository clone</description> + </setupTask> + <project name="dev" + label="Development and Releng"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${modisco.git.clone.location}" + locateNestedProjects="true"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\..*"/> + </sourceLocator> + <description>Development Projects</description> + </setupTask> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="${scope.project.root.label} Plugins"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.eclipseplugin.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.discovery.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.composition.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.discoverer.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.jee.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.kdm.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.manifest.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.omg.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.properties.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.modelfilter.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.simpletransformationschain.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.util.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.utils.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.workflow.*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.xml\.discoverer.*"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.feature"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.tests(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.facet(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.archi(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.doc(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.releng(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.oomph"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.updatesite"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser\.custom(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser\.uicore(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\..*\.benchmark"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser\.ecore\.ui"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.discoverer\.benchmark\.javaBenchmark"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.omg\.kdm(\..*)?"/> + </operand> + </predicate> + </workingSet> + <workingSet + name="${scope.project.root.label} Tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.tests(\..*)?"/> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.feature"/> + </operand> + </predicate> + </workingSet> + <workingSet + name="${scope.project.root.label} Facet Plugins"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.facet(\..*)?"/> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.feature"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.tests(\..*)?"/> + </operand> + </predicate> + </workingSet> + <workingSet + name="${scope.project.root.label} GMT Plugins"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.examples"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra.*(\..*)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java(\..*)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.omg(\..*)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.tool\.metricsvisualizationbuilder"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.xml(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.doc(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.feature"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.tests(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser\.ecore(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser\.editor(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\..*\.composition(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\..*\.discovery(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\..*\.discoverer(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\..*\.nousages(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.omg\.gastm(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.omg\.smm(\..*)?"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browse\r.custom\.examples\.generation"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.facet\.examples\.kdm"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.classiceobject"/> + </operand> + </predicate> + </workingSet> + <workingSet + name="${scope.project.root.label} Doc"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.tests(\..*)?"/> + </operand> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.doc(\..*)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.archi(\..*)?"/> + </operand> + </predicate> + </workingSet> + <workingSet + name="${scope.project.root.label} Features"> + <predicate + xsi:type="predicates:NamePredicate" + pattern=".*\.feature"/> + </workingSet> + <workingSet + name="${scope.project.root.label} Releng"> + <predicate + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.oomph"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.releng\..*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.updatesite"/> + </predicate> + </workingSet> + <workingSet + name="${scope.project.root.label} Probably Dead Plugins"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser\.custom\.examples\.generation"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.browser\.ecore\.ui"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.discovery\.benchmark"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.infra\.facet\.examples\.kdm"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.classiceobject"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.composition\.discoverer\.benchmark"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.discoverer\.benchmark"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.discoverer\.benchmark\.javaBenchmark"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.java\.nousages(\..*)?"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.smm\.quality"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.birtsampledb"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.bugzillametrics"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.java\.samplemetrics"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.java\.samplerefactoring"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.modelplex\.examples\.customization"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.perfannotatedumlstatechart"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.modisco\.usecase\.travelagency"/> + </workingSet> + </setupTask> + <stream + name="master" + label="Master (Latest)"/> + <stream + name="1.5.4" + label="1.5.4 (2024-03)"/> + <stream + name="1.5.3" + label="1.5.3 (2023-12)"/> + <stream + name="1.5.2" + label="1.5.2 (2021-12)"/> + <stream + name="1.5.1" + label="1.5.1 (2020-03)"/> + <stream + name="1.5.0" + label="1.5.0 (2019-12)"/> + <description>The development and Release Engineering environment for the MoDisco project</description> + </project> + <logicalProjectContainer + xsi:type="setup:ProjectCatalog" + href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/> + <description>The development environment for MoDisco</description> +</setup:Project> diff --git a/releng/org.eclipse.modisco.promote/.gitignore b/releng/org.eclipse.modisco.promote/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/releng/org.eclipse.modisco.promote/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/releng/org.eclipse.modisco.promote/.project b/releng/org.eclipse.modisco.promote/.project new file mode 100644 index 000000000..5a7d28c8c --- /dev/null +++ b/releng/org.eclipse.modisco.promote/.project @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.modisco.promote</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> diff --git a/releng/org.eclipse.modisco.promote/.settings/org.eclipse.core.resources.prefs b/releng/org.eclipse.modisco.promote/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/releng/org.eclipse.modisco.promote/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/releng/org.eclipse.modisco.promote/.settings/org.eclipse.core.runtime.prefs b/releng/org.eclipse.modisco.promote/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 000000000..5a0ad22d2 --- /dev/null +++ b/releng/org.eclipse.modisco.promote/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +line.separator=\n diff --git a/releng/org.eclipse.modisco.promote/pom.xml b/releng/org.eclipse.modisco.promote/pom.xml new file mode 100644 index 000000000..7715583cb --- /dev/null +++ b/releng/org.eclipse.modisco.promote/pom.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.modisco</groupId> + <artifactId>org.eclipse.modisco.promote</artifactId> + <version>1.5.5-SNAPSHOT</version> + <packaging>pom</packaging> + <!-- based on releng/org.eclipse.nebula.site/promotion/pom.xml and https://eclipse.dev/justj/?page=tools --> + <properties> + <tycho-version>4.0.5</tycho-version> + <tycho-extras-version>${tycho-version}</tycho-extras-version> + + <!-- + Overrideable parameters - defaults here might suit usage as part of a total build, but we + promote separately and only if the build succeeds, so overrides are probably necessary. + + The "Build MoDisco Promote Test"" launch allows some testing locally. + + The "JustJ for MoDisco" Eclipse launch supports regular Java debugging." + --> + <BUILD_COMMIT>-commit https://git.eclipse.org/r/modisco/org.eclipse.modisco.git/commit/?id=${env.GIT_COMMIT}</BUILD_COMMIT> + <BUILD_PROMOTE>https://ci.eclipse.org/modisco/job/modisco-master/lastSuccessfulBuild/artifact/targetPlatform</BUILD_PROMOTE> + <BUILD_REMOTE>-remote genie.qvt-oml@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/modeling/mdt/modisco</BUILD_REMOTE> + <BUILD_ROOT>${project.build.directory}/justj-sync</BUILD_ROOT> + <BUILD_TIMESTAMP>-timestamp ${build.timestamp}</BUILD_TIMESTAMP> + <BUILD_TYPE>${build.type}</BUILD_TYPE> + <BUILD_URL>https://ci.eclipse.org/modisco/job/modisco-master/lastSuccessfulBuild/</BUILD_URL> + + <eclipse.repo>https://download.eclipse.org/releases/latest</eclipse.repo> + <justj.tools.repo>https://download.eclipse.org/justj/tools/updates/nightly/latest</justj.tools.repo> + <org.eclipse.justj.p2.manager.args></org.eclipse.justj.p2.manager.args> + <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format> + + </properties> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-eclipserun-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <executionEnvironment>JavaSE-17</executionEnvironment> + <dependencies> + <dependency> + <artifactId>org.eclipse.justj.p2</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.apache.felix.scr</artifactId> + <type>eclipse-plugin</type> + </dependency> + </dependencies> + <repositories> + <repository> + <id>eclipse.repo</id> + <layout>p2</layout> + <url>${eclipse.repo}</url> + </repository> + <repository> + <id>justj.tools.repo</id> + <layout>p2</layout> + <url>${justj.tools.repo}</url> + </repository> + </repositories> + </configuration> + <executions> + <execution> + <id>promote</id> + <goals> + <goal>eclipse-run</goal> + </goals> + <phase>verify</phase> + <configuration> + <argLine></argLine> + <appArgLine> + -consoleLog + -application org.eclipse.justj.p2.manager + -data @None + -nosplash + ${org.eclipse.justj.p2.manager.args} + ${BUILD_REMOTE} + -retain 5 + -label "MoDisco" + -build-url ${BUILD_URL} + -root ${BUILD_ROOT} + -relative builds + -version-iu-pattern org\.eclipse\.modisco\.sdk\.feature.* + -primary-iu-filter-pattern org\.eclipse\.modisco\.sdk\.feature.* + ${BUILD_COMMIT} + -target-url https://download.eclipse.org/modeling/mdt/modisco + -promote ${BUILD_PROMOTE} + ${BUILD_TIMESTAMP} + -type ${BUILD_TYPE} + -breadcrumb "MoDisco https://projects.eclipse.org/projects/modeling.mdt.modisco" + -mapping modisco->MoDisco + -archive "P2 repos https://archive.eclipse.org/modeling/mdt/modisco/updates/release" + -archive "zips/drops https://archive.eclipse.org/modeling/mdt/modisco/downloads/drops" + ${org.eclipse.justj.p2.manager.extra.args} + </appArgLine> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file |