Skip to content

Commit

Permalink
Merge pull request #4168 from hansva/4114
Browse files Browse the repository at this point in the history 
Attempt to make the POM, assemblies and dependencies more structured #4114
  • Loading branch information
@hansva
hansva authored Jul 31, 2024
2 parents 019f79b + 56f7425 commit 3ca1152
Show file tree
Hide file tree
Showing 572 changed files with 7,369 additions and 12,054 deletions.
3 changes: 1 addition & 2 deletions .dockerignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
# Allow files and directories
!/assemblies/client/target/hop-*
!/assemblies/client/target/hop
!/assemblies/lib-jdbc
!/integration-tests/scripts
!/assemblies/web/target
!/assemblies/plugins/dist/target
!/assemblies/plugins/target
!/docker
!/rest
!google-key-apache-hop-it.json
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,5 @@ integration-tests/spreadsheet/files/exel-multi-part_4.xlsx
integration-tests/json/output
integration-tests/mdi/files/excelwriter-mdi-test.xlsx
integration-tests/spreadsheet/files/sample-file-append.xlsx

assemblies/debug/audit
152 changes: 8 additions & 144 deletions assemblies/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,102 +26,58 @@

<artifactId>hop-client</artifactId>
<packaging>pom</packaging>

<name>Hop Client</name>

<properties>
<org.eclipse.swt.cocoa.macosx.aarch64.version>${org.eclipse.platform.version}</org.eclipse.swt.cocoa.macosx.aarch64.version>
<org.eclipse.swt.cocoa.macosx.x86_64.version>${org.eclipse.platform.version}</org.eclipse.swt.cocoa.macosx.x86_64.version>
<org.eclipse.swt.gtk.linux.aarch64.version>${org.eclipse.platform.version}</org.eclipse.swt.gtk.linux.aarch64.version>
<!-- swt -->
<org.eclipse.swt.gtk.linux.x86_64.version>${org.eclipse.platform.version}</org.eclipse.swt.gtk.linux.x86_64.version>
<org.eclipse.swt.win32.win32.x86_64.version>${org.eclipse.platform.version}</org.eclipse.swt.win32.win32.x86_64.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-libs</artifactId>
<artifactId>hop-assemblies-plugins</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-libs-beam</artifactId>
<artifactId>hop-assemblies-static</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-libs-jdbc</artifactId>
<artifactId>hop-core</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-plugins-dist</artifactId>
<artifactId>hop-engine</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-samples</artifactId>
<artifactId>hop-engine-beam</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-static</artifactId>
<artifactId>hop-engines-beam</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-engine-beam</artifactId>
<artifactId>hop-ui</artifactId>
<version>${project.version}</version>
<type>jar</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<type>zip</type>
</dependency>

<!-- RCP fragment -->
Expand All @@ -130,96 +86,6 @@
<artifactId>hop-ui-rcp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Jetty -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.swt.cocoa.macosx.aarch64</artifactId>
Expand Down Expand Up @@ -253,8 +119,6 @@
</exclusion>
</exclusions>
</dependency>

<!-- swt -->
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
Expand Down
52 changes: 9 additions & 43 deletions assemblies/client/src/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,43 +37,27 @@
<includes>
<include>org.apache.hop:hop-assemblies-static:zip</include>
<include>org.apache.hop:hop-assemblies-samples:zip</include>
<include>org.apache.hop:hop-assemblies-plugins-dist:zip</include>
<include>org.apache.hop:hop-assemblies-plugins:zip</include>
<include>org.apache.hop:hop-core:zip</include>
<include>org.apache.hop:hop-engine:zip</include>
<include>org.apache.hop:hop-ui:zip</include>
<include>org.apache.hop:hop-engine-beam:zip</include>
<include>org.apache.hop:hop-engines-beam:zip</include>
</includes>
<unpack>true</unpack>
<outputDirectory>.</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<!-- hop lib jar files -->
<dependencySet>
<includes>
<include>org.apache.hop:hop-assemblies-libs:zip</include>
<include>org.apache.hop:hop-ui-rcp:jar</include>
</includes>
<unpack>true</unpack>
<outputDirectory>lib/core</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<!-- hop lib jar files -->
<dependencySet>
<includes>
<include>org.apache.hop:hop-assemblies-libs-beam:zip</include>
</includes>
<unpack>true</unpack>
<outputDirectory>lib/beam</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<!-- hop lib jar files -->
<dependencySet>
<includes>
<include>org.apache.hop:hop-assemblies-libs-jdbc:zip</include>
</includes>
<unpack>true</unpack>
<outputDirectory>lib/jdbc</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>

<!-- swt -->
<dependencySet>
<includes>
Expand Down Expand Up @@ -120,23 +104,5 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<includes>
<include>org.apache.hop:hop-ui-rcp</include>
<include>org.eclipse.jetty:*</include>
<include>javax.servlet:javax.servlet-api</include>
</includes>
<outputDirectory>lib/core</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<includes>
<include>org.apache.hop:hop-engine-beam</include>
</includes>
<outputDirectory>lib/beam</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>
Loading

0 comments on commit 3ca1152

Please sign in to comment.