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

Jump to bottom

Build updates #204

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+16 −130
Open

Build updates #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d57fd8f
Removed unused travis-ci configuration
mickaelistria Apr 23, 2024
535b42c
Update build config
mickaelistria Apr 23, 2024
c8b6f8e
Use newer Apache commons bundles
mickaelistria Apr 23, 2024
6b588ed
Remove xtext nature/builder
mickaelistria Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion aCute-master/.gitignore
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions aCute-master/.project
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions aCute-master/.travis.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion org.eclipse.acute.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.lsp4e;bundle-version="0.2.0",
org.eclipse.lsp4j;bundle-version="0.4.0",
org.apache.commons.io;bundle-version="2.2.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.4.0",
org.eclipse.debug.ui
Import-Package: org.apache.commons.io
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.acute.tests
6 changes: 0 additions & 6 deletions org.eclipse.acute/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
Expand All @@ -35,6 +30,5 @@
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
7 changes: 4 additions & 3 deletions org.eclipse.acute/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.lsp4e;bundle-version="0.1.0",
org.apache.commons.io;bundle-version="2.2.0",
org.eclipse.tm4e.core,
org.eclipse.ui.genericeditor;bundle-version="1.0.0",
org.eclipse.tm4e.ui,
Expand All @@ -22,12 +21,14 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.externaltools,
org.eclipse.jdt.annotation;resolution:=optional,
com.google.gson;bundle-version="2.7.0",
org.apache.commons.compress;bundle-version="1.6.0",
org.eclipse.lsp4e.debug;bundle-version="0.2.0",
org.eclipse.ui.externaltools
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.variables
Import-Package: org.eclipse.core.variables,
org.apache.commons.compress.archivers.tar,
org.apache.commons.io,
org.apache.commons.io.input
Export-Package: org.eclipse.acute;x-internal:=true,
org.eclipse.acute.debug;x-internal:=true
Automatic-Module-Name: org.eclipse.acute
36 changes: 6 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@
<packaging>pom</packaging>

<prerequisites>
<maven>3.3.1</maven>
<maven>3.9.0</maven>
</prerequisites>
<properties>
<tycho-version>3.0.4</tycho-version>
<tycho-version>4.0.7</tycho-version>
<tycho.scmUrl>scm:git:https://github.com/eclipse/acute.git</tycho.scmUrl>
<jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree>
<download-maven-plugin.version>1.6.8</download-maven-plugin.version>
<download-maven-plugin.version>1.9.0</download-maven-plugin.version>
<cbi.jarsigner.skip>true</cbi.jarsigner.skip>
</properties>

<modules>
<module>target-platform</module>
<module>org.eclipse.acute</module>
<module>roslynFragments/org.eclipse.acute.omnisharpServer.linux.x86_64</module>
<module>roslynFragments/org.eclipse.acute.omnisharpServer.win32.x86_64</module>
Expand All @@ -42,13 +41,8 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.acute</groupId>
<artifactId>target-platform</artifactId>
<version>0.3.2-SNAPSHOT</version>
</artifact>
<file>../target-platform/target-platform.target</file>
</target>
<environments>
<environment>
Expand Down Expand Up @@ -85,7 +79,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<sourceReferences>
<generate>true</generate>
Expand Down Expand Up @@ -118,27 +111,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<executions>
<execution>
<goals><goal>prepare-agent</goal></goals>
</execution>
</executions>
<configuration>
<append>true</append>
<destFile>${sonar.jacoco.reportPath}</destFile>
<includes>
<include>org.eclipse.acute*</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
<version>1.4.2</version>
<version>1.4.3</version>
<executions>
<execution>
<id>sign</id>
Expand Down Expand Up @@ -194,7 +170,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.2</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion repository/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<bundle id="org.eclipse.ui.genericeditor" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<bundle id="org.apache.commons.io" version="0.0.0">
<bundle id="org.apache.commons.commons-io" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<bundle id="org.joni" version="0.0.0">
Expand Down
17 changes: 0 additions & 17 deletions target-platform/.project
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions target-platform/pom.xml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions target-platform/target-platform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
<unit id="org.apache.commons.io" version="0.0.0"/>
<unit id="org.apache.commons.compress" version="0.0.0"/>
<unit id="org.apache.commons.commons-io" version="0.0.0"/>
<unit id="org.apache.commons.commons-compress" version="0.0.0"/>
<unit id="org.objectweb.asm" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2023-03/"/>
<repository location="http://download.eclipse.org/releases/latest/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.27/"/>
<repository location="https://download.eclipse.org/eclipse/updates/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
Expand Down