Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added source bundle/feature generation, cleaned up p2 categories, and added missing bundles

Browse Source
This commit is contained in:
Martin Lippert
2020-10-01 09:02:27 +02:00
parent 4e7a1f4eb5
commit c71d6cab08
8 changed files with 556 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/build.properties
View File

@@ -1,3 +1,6 @@
bin.includes = META-INF/,\
plugin.xml,\
about.html
src.includes = META-INF/,\
plugin.xml,\
about.html

68
eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
View File

@@ -6,22 +6,42 @@
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.boot.ls.feature.source">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature.source">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature.source">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.bosh.ls.feature">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.bosh.ls.feature.source">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.concourse.ls.feature">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<feature id="org.springframework.tooling.concourse.ls.feature.source">
<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
</feature>
<category-def name="deps" label="Dependencies"/>
<feature id="org.eclipse.mylyn.wikitext_feature">
@@ -32,50 +52,98 @@
<category name="deps"/>
</bundle>
<bundle id="org.springframework.tooling.ls.eclipse.commons.source">
<category name="deps"/>
</bundle>
<bundle id="org.springframework.tooling.jdt.ls.commons">
<category name="deps"/>
</bundle>
<bundle id="org.springframework.tooling.jdt.ls.commons.source">
<category name="deps"/>
</bundle>
<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
<category name="deps"/>
</bundle>
<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.boot.ls">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.boot.ls.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.core">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.core.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.frameworks.core">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.frameworks.core.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.frameworks.test.util">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.frameworks.test.util.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.jdk_tools">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.jdk_tools.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.livexp">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.livexp.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.tests.util">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.tests.util.source">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.ui">
<category name="deps"/>
</bundle>
<bundle id="org.springsource.ide.eclipse.commons.ui.source">
<category name="deps"/>
</bundle>
<bundle id="io.projectreactor.reactor-core">
<category name="deps"/>
</bundle>

57
eclipse-language-servers/pom.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.boot.ide</groupId>
@@ -42,7 +41,7 @@
<module>../headless-services/jdt-ls-extension</module>
<module>org.springframework.tooling.ls.eclipse.commons</module>
<module>org.springframework.tooling.ls.eclipse.commons.test</module>
<module>org.springsource.ide.eclipse.commons.boot.ls</module>
<module>org.springsource.ide.eclipse.commons.core</module>
<module>org.springsource.ide.eclipse.commons.frameworks.core</module>
@@ -108,7 +107,7 @@
<dist.version>nightly</dist.version>
</properties>
</profile>
<profile>
<id>milestone</id>
<properties>
@@ -116,7 +115,7 @@
<dist.version>today</dist.version> <!-- should be overridden when building with some timestamp like 20171114 -->
</properties>
</profile>
<profile>
<id>release</id>
<properties>
@@ -192,7 +191,7 @@
<layout>p2</layout>
<url>https://download.eclipse.org/mylyn/docs/releases/3.0/</url>
</repository>
<!-- <repository>
<!-- <repository>
<id>lsp4e</id>
<layout>p2</layout>
<url>https://download.eclipse.org/lsp4e/snapshots/</url>
@@ -242,7 +241,7 @@
<layout>p2</layout>
<url>https://download.eclipse.org/mylyn/docs/releases/3.0/</url>
</repository>
<!-- <repository>
<!-- <repository>
<id>lsp4e</id>
<layout>p2</layout>
<url>https://download.eclipse.org/lsp4e/snapshots/</url>
@@ -296,10 +295,10 @@
</repositories>
<pluginRepositories>
<pluginRepository>
<id>tycho-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
</pluginRepository>
<pluginRepository>
<id>tycho-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
</pluginRepository>
<!-- necessary for Maven and Ant AWS dependency -->
<pluginRepository>
<id>spring-maven-release</id>
@@ -328,6 +327,35 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>source-feature</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
@@ -371,9 +399,10 @@
<storepass>${signing.store.password}</storepass>
<keypass>${signing.key.password}</keypass>
<tsa>http://sha256timestamp.ws.symantec.com/sha256/timestamp</tsa>
<!-- <tsa>http://timestamp.digicert.com</tsa> -->
<!-- <tsa>http://timestamp.digicert.com</tsa> -->
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
@@ -384,7 +413,7 @@
<goals>
<goal>p2-metadata</goal>
</goals>
<phase>verify</phase>
<phase>package</phase>
</execution>
</executions>
</plugin>
@@ -392,6 +421,7 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
@@ -401,6 +431,7 @@
<compilerArgument>-err:-forbidden</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>