Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try newer Wild Web Developer + LemMinX-Maven #845

Merged
merged 1 commit into from
Jul 11, 2022
Merged

Try newer Wild Web Developer + LemMinX-Maven #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Import-Package: org.eclipse.core.runtime;version="3.5.0",
org.osgi.framework;version="1.10.0",
org.slf4j;version="1.7.2"
Require-Bundle: javax.inject,
org.eclipse.wildwebdeveloper.xml;bundle-version="[0.13.1,0.14.0)",
org.eclipse.wildwebdeveloper.xml;bundle-version="[0.15.0,0.16.0)",
org.eclipse.lsp4e;bundle-version="0.13.7",
org.eclipse.lsp4j;bundle-version="0.9.0",
org.eclipse.m2e.core,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.editor.lemminx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<groupId>org.eclipse.lemminx</groupId>
<artifactId>lemminx-maven</artifactId>
<!-- Don't release if this points to SNAPSHOT -->
<version>0.5.2</version>
<version>0.6.0-SNAPSHOT</version>
<outputDirectory>${basedir}</outputDirectory>
<destFileName>lemminx-maven.jar</destFileName>
<!-- Edit forceQualifierUpdate.txt to force usage of newer SNAPSHOT, otherwise
Expand Down
14 changes: 7 additions & 7 deletions target-platform/target-platform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<unit id="ch.qos.logback.slf4j" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/0.13.5/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
<repository location="https://download.eclipse.org/wildwebdeveloper/snapshots/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have to update the referenced repo in the category.xml as well. Otherwise users have to install the snapshots separately.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather avoid having snapshots leaking in categoy.xml because we're very likely to forget about them. Snapshots are for testers, and testers will probably have to add the Wild Web Developer snapshot p2 repo by themselves. I think it's safer than the risk of having Wild Web Developer snapshots installed on all m2e users' machine if we forget about it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a point.

I wonder if we could use variables for the specific URL that is defined at one Location (maybe the root pom.xml or the .mvn/maven.config?) and shared by the *.target and category.xml file and is understood in the build and the IDE.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See eclipse-pde/eclipse.pde#204

<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
Expand All @@ -59,18 +59,18 @@
<version>6.3.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.repository</artifactId>
<version>1.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>io.takari.m2e.workspace</groupId>
<artifactId>org.eclipse.m2e.workspace.cli</artifactId>
<version>0.3.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.repository</artifactId>
<version>1.1.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
Expand Down