Skip to content

Commit

Permalink
Update eclipse plugin dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunye
sunye committed Oct 1, 2024
1 parent 4ad2fc6 commit 282f88d
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 60 deletions.
10 changes: 1 addition & 9 deletions plugins/eclipse/bundles/ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,9 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>2.2.0</version>
<version>${apache.felix.version}</version>
</dependency>

<!--
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
-->

<dependency>
<groupId>org.atlanmod.neoemf</groupId>
<artifactId>neoemf-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
<version>33.3.1-jre</version>
</dependency>

<dependency>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>2.0.16</version>
</dependency>

</dependencies>
Expand Down
20 changes: 7 additions & 13 deletions plugins/eclipse/examples/projects/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>2.2.0</version>
<version>${apache.felix.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -113,7 +113,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xcore.lib</artifactId>
<version>1.6.0</version>
<version>1.7.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -164,7 +164,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.6.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -217,7 +217,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.resources</artifactId>
<version>3.14.0</version>
<version>3.20.200</version>
</dependency>

<!-- Xtext -->
Expand All @@ -235,12 +235,6 @@
<version>${xtext.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.generator</artifactId>
<version>${xtext.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
Expand Down Expand Up @@ -274,13 +268,13 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xcore</artifactId>
<version>1.17.0</version>
<version>1.20.0</version>
</dependency>

<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xcore.lib</artifactId>
<version>1.5.0</version>
<version>1.7.0</version>
</dependency>

<!-- EMF: CodeGen -->
Expand All @@ -301,7 +295,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen.ecore.xtext</artifactId>
<version>1.6.0</version>
<version>1.8.0</version>
</dependency>

</dependencies>
Expand Down
3 changes: 2 additions & 1 deletion plugins/eclipse/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@
<module>releng</module>
</modules>


<dependencies>
<dependency>
<!-- Added to solve dependency problem to osgi.extender
(&(osgi.extender=osgi.component)(version>=1.4.0)(!(version>=2.0.0))) -->
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>2.1.28</version>
<version>${apache.felix.version}</version>
</dependency>
</dependencies>

Expand Down
24 changes: 15 additions & 9 deletions plugins/eclipse/releng/configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,31 @@
<properties>
<maven.test.skip>true</maven.test.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<tycho-plugin.version>2.7.3</tycho-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<tycho-plugin.version>4.0.9</tycho-plugin.version>
<apache.felix.version>2.2.12</apache.felix.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.debug>true</maven.compiler.debug>
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<compare.url>http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3</compare.url>
</properties>

<repositories>
<repository>
<id>emf-compare</id>
<layout>p2</layout>
<url>https://download.eclipse.org/modeling/emf/compare/updates/releases/latest/</url>
<url>${compare.url}</url>
</repository>
<repository>
<id>2020-12</id>
<id>2024-12</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2020-12/</url>
<url>https://download.eclipse.org/releases/2024-12/</url>
</repository>
<repository>
<id>emf</id>
<layout>p2</layout>
<url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.39.0/</url>
</repository>
</repositories>

Expand Down Expand Up @@ -70,7 +77,7 @@
<artifactId>target-platform-configuration</artifactId>
<configuration>
<pomDependencies>consider</pomDependencies>
<executionEnvironment>JavaSE-11</executionEnvironment>
<executionEnvironment>JavaSE-17</executionEnvironment>
<environments>
<environment>
<os>win32</os>
Expand All @@ -91,15 +98,14 @@
</configuration>
</plugin>


</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.13.0</version>
</plugin>

<plugin>
Expand Down
2 changes: 1 addition & 1 deletion plugins/eclipse/releng/update/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
</dependency>

<dependency>
Expand Down
58 changes: 33 additions & 25 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,31 +191,6 @@
<build>
<plugins>

<plugin>
<groupId>com.github.ferstl</groupId>
<artifactId>depgraph-maven-plugin</artifactId>
<version>4.0.3</version>
<configuration>

<showGroupIds>true</showGroupIds>
<showConflicts>true</showConflicts>
<showDuplicates>true</showDuplicates>
</configuration>
</plugin>

<plugin>
<groupId>se.kth.castor</groupId>
<artifactId>depclean-maven-plugin</artifactId>
<version>2.0.5</version>
<executions>
<execution>
<goals>
<goal>depclean</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down Expand Up @@ -636,6 +611,39 @@
</plugins>
</build>
</profile>

<profile>
<id>dependency-analysis</id>
<build>
<plugins>

<plugin>
<groupId>com.github.ferstl</groupId>
<artifactId>depgraph-maven-plugin</artifactId>
<version>4.0.3</version>
<configuration>
<showGroupIds>true</showGroupIds>
<showConflicts>true</showConflicts>
<showDuplicates>true</showDuplicates>
</configuration>
</plugin>

<plugin>
<groupId>se.kth.castor</groupId>
<artifactId>depclean-maven-plugin</artifactId>
<version>2.0.6</version>
<executions>
<execution>
<goals>
<goal>depclean</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
</profile>
</profiles>

</project>

0 comments on commit 282f88d

Please sign in to comment.