Skip to content

Commit

Permalink
Revert "Managing all Eclipse platform dependencies (#344)"
Browse files Browse the repository at this point in the history
This reverts commit 384a604.
  • Loading branch information
gastaldi authored Dec 13, 2024
1 parent 384a604 commit bda9d5b
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 197 deletions.
6 changes: 0 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ updates:
time: "07:00"
timezone: America/Sao_Paulo
open-pull-requests-limit: 10
groups:
eclipse:
patterns:
- "org.eclipse*"
- "org.osgi*"

- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
Expand Down
334 changes: 143 additions & 191 deletions impl/pom.xml
Original file line number Diff line number Diff line change
@@ -1,193 +1,145 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.forge.roaster</groupId>
<artifactId>roaster-parent</artifactId>
<version>2.31.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>roaster-jdt</artifactId>
<name>Forge Roaster - JDT Implementation</name>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.40.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.resources</artifactId>
<version>3.22.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.32.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.19.200</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.team.core</artifactId>
<version>3.9.500</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.text</artifactId>
<version>3.14.200</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.jobs</artifactId>
<version>3.15.400</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.contenttype</artifactId>
<version>3.9.600</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.preferences</artifactId>
<version>3.11.200</version>
</dependency>
</dependencies>
</dependencyManagement>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.forge.roaster</groupId>
<artifactId>roaster-parent</artifactId>
<version>2.31.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>roaster-jdt</artifactId>
<name>Forge Roaster - JDT Implementation</name>
<properties>
<version.jdt>3.40.0</version.jdt>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.forge.roaster</groupId>
<artifactId>roaster-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>${version.jdt}</version>
<exclusions>
<exclusion>
<groupId>org.osgi.service</groupId>
<artifactId>org.osgi.service.prefs</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.ant.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.commands</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.expressions</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.app</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.registry</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.filesystem</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
</dependencies>

<dependencies>
<dependency>
<groupId>org.jboss.forge.roaster</groupId>
<artifactId>roaster-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<exclusions>
<exclusion>
<groupId>org.osgi.service</groupId>
<artifactId>org.osgi.service.prefs</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.ant.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.commands</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.expressions</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.app</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.registry</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.filesystem</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<createSourcesJar>true</createSourcesJar>
<artifactSet>
<excludes>
<exclude>org.jboss.forge.roaster:roaster-api</exclude>
</excludes>
</artifactSet>
<filters>
<filter>
<artifact>org.apache.commons:commons-text</artifact>
<includes>
<include>org/apache/commons/text/StringEscapeUtils**</include>
<include>org/apache/commons/text/translate/**</include>
</includes>
</filter>
<filter>
<artifact>org.apache.commons:commons-lang3</artifact>
<includes>
<include>org/apache/commons/lang3/StringUtils**</include>
<include>org/apache/commons/lang3/Range**</include>
<include>org/apache/commons/lang3/Validate**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/eclipse.inf</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/NOTICE</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>**/module-info.class</exclude>
<exclude>.options</exclude>
<exclude>.api_description</exclude>
<exclude>*.html</exclude>
<exclude>schema/contentTypes.exsd</exclude>
<exclude>schema/preferences.exsd</exclude>
<exclude>plugin.xml</exclude>
<exclude>plugin.properties</exclude>
<exclude>about_files/*</exclude>
<exclude>OSGI-INF/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.eclipse</pattern>
<shadedPattern>org.jboss.forge.roaster._shade.org.eclipse</shadedPattern>
<excludes>
<exclude>org.eclipse.jdt.core.prefs</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.osgi</pattern>
<shadedPattern>org.jboss.forge.roaster._shade.org.osgi</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache</pattern>
<shadedPattern>org.jboss.forge.roaster._shade.org.apache</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<createSourcesJar>true</createSourcesJar>
<artifactSet>
<excludes>
<exclude>org.jboss.forge.roaster:roaster-api</exclude>
</excludes>
</artifactSet>
<filters>
<filter>
<artifact>org.apache.commons:commons-text</artifact>
<includes>
<include>org/apache/commons/text/StringEscapeUtils**</include>
<include>org/apache/commons/text/translate/**</include>
</includes>
</filter>
<filter>
<artifact>org.apache.commons:commons-lang3</artifact>
<includes>
<include>org/apache/commons/lang3/StringUtils**</include>
<include>org/apache/commons/lang3/Range**</include>
<include>org/apache/commons/lang3/Validate**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/eclipse.inf</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/NOTICE</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>**/module-info.class</exclude>
<exclude>.options</exclude>
<exclude>.api_description</exclude>
<exclude>*.html</exclude>
<exclude>schema/contentTypes.exsd</exclude>
<exclude>schema/preferences.exsd</exclude>
<exclude>plugin.xml</exclude>
<exclude>plugin.properties</exclude>
<exclude>about_files/*</exclude>
<exclude>OSGI-INF/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.eclipse</pattern>
<shadedPattern>org.jboss.forge.roaster._shade.org.eclipse</shadedPattern>
<excludes>
<exclude>org.eclipse.jdt.core.prefs</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.osgi</pattern>
<shadedPattern>org.jboss.forge.roaster._shade.org.osgi</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache</pattern>
<shadedPattern>org.jboss.forge.roaster._shade.org.apache</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit bda9d5b

Please sign in to comment.