Skip to content

Commit

Permalink
Merge pull request #272 from eclipse/cd_orbit202312M3
Browse files Browse the repository at this point in the history
orbit bump for 2023-12 M3
  • Loading branch information
cdietrich authored Oct 29, 2023
2 parents 62067fa + 175396f commit 02b140b
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.mwe.core-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ SPDX-License-Identifier: EPL-2.0

<requires>
<import plugin="org.eclipse.emf.mwe2.runtime" version="2.16.0" match="compatible"/>
<import plugin="org.apache.commons.cli" version="1.5.0" match="compatible"/>
<import plugin="org.apache.commons.cli" version="1.6.0" match="compatible"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.mwe2.launcher-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ SPDX-License-Identifier: EPL-2.0
<import plugin="com.google.guava" version="32.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="org.apache.commons.cli" version="1.5.0" match="compatible"/>
<import plugin="org.apache.commons.cli" version="1.6.0" match="compatible"/>
<import plugin="org.apache.log4j"/>
</requires>

Expand Down
2 changes: 1 addition & 1 deletion maven/org.eclipse.emf.mwe2.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<maven-install-version>2.5.2</maven-install-version>
<maven-deploy-version>2.8.2</maven-deploy-version>
<maven-javadoc-version>3.4.1</maven-javadoc-version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-cli.version>1.6.0</commons-cli.version>
<guava.version>32.1.3-jre</guava.version>
<google-inject.version>7.0.0</google-inject.version>
<log4j.version>1.2.25</log4j.version>
Expand Down
8 changes: 4 additions & 4 deletions maven/org.eclipse.emf.mwe2.repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
</feature>
<bundle id="com.google.guava" version="32.1.3.qualifier"/>
<bundle id="com.google.guava.source" version="32.1.3.qualifier"/>
<bundle id="com.google.guava.failureaccess" version="1.0.1.qualifier"/>
<bundle id="com.google.guava.failureaccess.source" version="1.0.1.qualifier"/>
<bundle id="org.apache.commons.cli" version="1.5.0"/>
<bundle id="org.apache.commons.cli.source" version="1.5.0"/>
<bundle id="com.google.guava.failureaccess" version="1.0.2.qualifier"/>
<bundle id="com.google.guava.failureaccess.source" version="1.0.2.qualifier"/>
<bundle id="org.apache.commons.cli" version="1.6.0"/>
<bundle id="org.apache.commons.cli.source" version="1.6.0"/>
<category-def name="mwe2lang" label="MWE">
<description>
The configuration language used to configure Xtext&apos;s code generator.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="org.apache.commons.cli" version="1.5.0"/>
<unit id="org.apache.commons.cli.source" version="1.5.0"/>
<unit id="org.apache.commons.cli" version="1.6.0"/>
<unit id="org.apache.commons.cli.source" version="1.6.0"/>
<unit id="com.google.guava" version="32.1.3.jre"/>
<unit id="com.google.guava.source" version="32.1.3.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.guava.failureaccess.source" version="1.0.1"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.guava.failureaccess.source" version="1.0.2"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="org.apache.commons.cli" version="1.5.0"/>
<unit id="org.apache.commons.cli.source" version="1.5.0"/>
<unit id="org.apache.commons.cli" version="1.6.0"/>
<unit id="org.apache.commons.cli.source" version="1.6.0"/>
<unit id="com.google.guava" version="32.1.3.jre"/>
<unit id="com.google.guava.source" version="32.1.3.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.guava.failureaccess.source" version="1.0.1"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.guava.failureaccess.source" version="1.0.2"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down

0 comments on commit 02b140b

Please sign in to comment.