Skip to content
This repository has been archived by the owner on Sep 22, 2024. It is now read-only.

All dependencies bumped to latest releases #22

Merged
merged 6 commits into from
Jul 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mvn -version
shell: bash
- name: Build and package epoch
run: mvn package || mvn -U package
run: mvn -U package
shell: bash
- name: Deploy nightly release
uses: marvinpinto/action-automatic-releases@latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/eclipse-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
- name: Install pnpm
run: npm i -g pnpm
- name: Run Eclipse tests
run: mvn -P test integration-test || mvn -U -P test integration-test
run: mvn -U -P test integration-test
shell: bash
16 changes: 8 additions & 8 deletions oomph/LinguaFrancaEpoch.setup
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
value="2022-06"
value="2023-06"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup.p2:P2Task">
Expand Down Expand Up @@ -161,7 +161,7 @@
name="org.eclipse.tm.terminal.feature.feature.group"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="2.27.0"/>
versionRange="2.31.0"/>
<requirement
name="org.eclipse.m2e.feature.feature.group"/>
<requirement
Expand Down Expand Up @@ -283,10 +283,10 @@
versionRange="27.0.0"/>
<requirement
name="org.eclipse.xtext.runtime.feature.group"
versionRange="2.27.0"/>
versionRange="2.31.0"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="2.27.0"/>
versionRange="2.31.0"/>
<requirement
name="org.eclipse.platform.source.feature.group"/>
<requirement
Expand Down Expand Up @@ -332,15 +332,15 @@
<repositoryList
name="DefaultRepositories">
<repository
url="http://download.eclipse.org/releases/2022-06"/>
url="http://download.eclipse.org/releases/2023-06"/>
<repository
url="http://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
url="http://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
<repository
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
<repository
url="http://download.eclipse.org/elk/updates/releases/0.8.1/"/>
<repository
url="https://kieler.github.io/KLighD/v2.2.0/"/>
url="https://kieler.github.io/KLighD/v2.3.0/"/>
<repository
url="https://github.com/fabioz/Pydev/releases/download/pydev_9_0_1/"/>
<repository
Expand Down
1 change: 1 addition & 0 deletions org.lflang.product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>gen-clean</id>
Expand Down
14 changes: 7 additions & 7 deletions org.lflang.targetplatform/org.lflang.targetplatform.target
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="jakarta.xml.bind" version="0.0.0"/>
<unit id="javaewah" version="0.0.0"/>
<unit id="javax.websocket" version="0.0.0"/>
<unit id="javax.xml" version="0.0.0"/>
<unit id="net.i2p.crypto.eddsa" version="0.0.0"/>
Expand Down Expand Up @@ -32,26 +31,27 @@
<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2022-06"/>
<repository location="https://download.eclipse.org/releases/2023-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.xtext.runtime.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="com.google.inject" version="0.0.0"/>
<unit id="jakarta.activation" version="0.0.0"/>
<unit id="javax.activation" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
<unit id="javaewah" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.lflang.epoch.external.dependencies" version="0.0.0"/>
<repository location="https://lf-lang.github.io/epoch-external-dependencies/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.contribution.weaving.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/ajdt/410/dev/update"/>
<repository location="https://download.eclipse.org/tools/ajdt/410/dev/update"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.python.pydev.feature.feature.group" version="0.0.0"/>
Expand All @@ -68,7 +68,7 @@
<unit id="de.cau.cs.kieler.klighd.freehep.feature.feature.group" version="0.0.0"/>
<unit id="de.cau.cs.kieler.klighd.lsp" version="0.0.0"/>
<unit id="de.cau.cs.kieler.klighd.ui.contrib3x" version="0.0.0"/>
<repository location="https://kieler.github.io/KLighD/v2.2.0/"/>
<repository location="https://kieler.github.io/KLighD/v2.3.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand All @@ -78,7 +78,7 @@
<unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/elk/updates/releases/0.8.1/"/>
<repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
</location>
</locations>
</target>
1 change: 1 addition & 0 deletions org.lflang.ui.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.xtext.ui.testing,
org.eclipse.xtext.xbase.junit,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.xbase.ui.testing,
org.eclipse.xtext.builder,
org.lflang,
org.lflang.ui,
Expand Down
19 changes: 10 additions & 9 deletions org.lflang.ui/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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">
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>

Expand All @@ -18,14 +18,15 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
<id>gen-clean</id>
<phase>clean</phase>
</execution>
</executions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>gen-clean</id>
<phase>clean</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
1 change: 1 addition & 0 deletions org.lflang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<configuration>
<filesets combine.children="append">
<fileset>
Expand Down
83 changes: 77 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@

<!-- Eclipse specific components -->
<!-- Important: Any version specified for these plugins must be available via the update sites listed in the target platform definition. If not, the Epoch build will fail! You can find the target platform definition in org.lflang.targetplatform/org.lflang.targetplatform.target. Changes to the target platform should also be transferred to the oomph setup (oomph/LinguaFranca.setup). -->
<xtextVersion>2.27.0</xtextVersion>
<lsp4jVersion>0.14.0</lsp4jVersion> <!-- This plugin is provided by Xtext -->
<mwe2LaunchVersion>2.13.0</mwe2LaunchVersion> <!-- This plugin is provided by Eclipse, not Xtext -->
<xtextVersion>2.31.0</xtextVersion>
<lsp4jVersion>0.21.0</lsp4jVersion> <!-- This plugin is provided by Xtext -->
<mwe2LaunchVersion>2.14.0</mwe2LaunchVersion> <!-- This plugin is provided by Eclipse, not Xtext -->

<!-- Tycho version used by Maven (Eclipse specific build support)-->
<tychoVersion>2.6.0</tychoVersion>
<tychoVersion>2.7.5</tychoVersion>
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>

<!-- Maven only properties -->
<maven.compiler.source>17</maven.compiler.source>
Expand Down Expand Up @@ -72,13 +73,83 @@
</profile>
</profiles>


<repositories>
<repository>
<id>codehaus-snapshots</id>
<name>disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478</name>
<url>http://nexus.codehaus.org/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>tycho-staged</id>
<url>https://oss.sonatype.org/content/repositories/orgeclipsetycho-1070</url>
<id>codehaus-snapshots</id>
<name>disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478</name>
<url>http://nexus.codehaus.org/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>


<build>

<pluginManagement>
Expand Down