This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new ff16143c4c build(release): build and deploy hop-client with the
release (#8915)
ff16143c4c is described below
commit ff16143c4c14a2cca46c5ef55a0dfa5989d15a17
Author: Romain Manni-Bucau <[email protected]>
AuthorDate: Wed Nov 18 14:47:17 2026 +0100
build(release): build and deploy hop-client with the release (#8915)
* build(release): build and deploy hop-client with the release
* [style] spotless
* some extra cleanup
---------
Co-authored-by: Hans Van Akelyen <[email protected]>
---
assemblies/client/pom.xml | 76 ++++++++++++++++++++--
assemblies/client/src/assembly/assembly.xml | 23 +++++--
assemblies/pom.xml | 3 +
core/pom.xml | 16 -----
core/src/assembly/assembly.xml | 32 ---------
.../pages/apache-release/checking-a-release.adoc | 13 ++++
.../pages/apache-release/creating-a-release.adoc | 50 +++++++-------
.../pages/apache-release/promoting-a-release.adoc | 7 +-
engine/pom.xml | 16 -----
engine/src/assembly/assembly.xml | 32 ---------
pom.xml | 5 +-
rcp/pom.xml | 16 -----
rcp/src/assembly/assembly.xml | 33 ----------
ui/pom.xml | 16 -----
ui/src/assembly/assembly.xml | 35 ----------
15 files changed, 139 insertions(+), 234 deletions(-)
diff --git a/assemblies/client/pom.xml b/assemblies/client/pom.xml
index fd25d39c3c..87f7153f60 100644
--- a/assemblies/client/pom.xml
+++ b/assemblies/client/pom.xml
@@ -29,6 +29,11 @@
<name>Hop Client</name>
<properties>
+ <!-- hop-client-<version>.zip is published to Maven Central next to
the copy on
+ dist.apache.org, so it can be resolved as a normal artifact. The
other assemblies
+ (web, plugins, static, debug) stay unpublished through the
parent's
+ maven.deploy.skip. The deployed POM is flattened, see
flatten-maven-plugin below. -->
+ <maven.deploy.skip>false</maven.deploy.skip>
<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>
@@ -36,30 +41,58 @@
<org.eclipse.swt.win32.win32.x86_64.version>${org.eclipse.platform.version}</org.eclipse.swt.win32.win32.x86_64.version>
</properties>
+ <!-- hop-core, hop-engine and hop-ui resolve their dependencies against
hop-libs. Import it
+ here too so lib/core gets the same versions and exclusions as those
modules' builds. -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-libs</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-plugins</artifactId>
<version>${project.version}</version>
<type>zip</type>
+ <!-- Unpacked as is; its dependencies must not take part in
version mediation
+ for the lib/core dependency set. -->
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-static</artifactId>
<version>${project.version}</version>
<type>zip</type>
+ <!-- Unpacked as is; its dependencies must not take part in
version mediation
+ for the lib/core dependency set. -->
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-core</artifactId>
<version>${project.version}</version>
- <type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-engine</artifactId>
<version>${project.version}</version>
- <type>zip</type>
</dependency>
<!-- hop-engines-beam and hop-engines-spark are marketplace-optional
plugins (not bundled
in the client). Use -Pbeam / -Pfull to bake the full Beam plugin
— including its
@@ -68,7 +101,6 @@
<groupId>org.apache.hop</groupId>
<artifactId>hop-ui</artifactId>
<version>${project.version}</version>
- <type>zip</type>
</dependency>
<!-- RCP fragment -->
@@ -76,7 +108,6 @@
<groupId>org.apache.hop</groupId>
<artifactId>hop-ui-rcp</artifactId>
<version>${project.version}</version>
- <type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
@@ -135,6 +166,43 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <!-- The dependencies above are build inputs for the assembly
descriptor, not a
+ classpath for consumers: several are never published
(hop-assemblies-*) and the
+ parent hop-assemblies POM is not deployed either. Publish a
POM without parent,
+ dependencies, profiles or build so hop-client:zip resolves on
its own. -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>${flatten-maven-plugin.version}</version>
+ <configuration>
+ <flattenMode>ossrh</flattenMode>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+ <!-- Flatten skips pom packaging unless told otherwise. -->
+ <updatePomFile>true</updatePomFile>
+ <pomElements>
+ <dependencies>remove</dependencies>
+ <dependencyManagement>remove</dependencyManagement>
+ <profiles>remove</profiles>
+ <build>remove</build>
+ <repositories>remove</repositories>
+ <pluginRepositories>remove</pluginRepositories>
+ </pomElements>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <phase>process-resources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<!--
Opt-in Beam engine + SDKs in hop-client (plugin jar plus its libs in
lib/core).
Analogous to HOP_SPARK_CLIENT_VERSION=native for Spark: default lean
client has no Beam
diff --git a/assemblies/client/src/assembly/assembly.xml
b/assemblies/client/src/assembly/assembly.xml
index d25f356db3..ecef077a16 100644
--- a/assemblies/client/src/assembly/assembly.xml
+++ b/assemblies/client/src/assembly/assembly.xml
@@ -37,11 +37,7 @@
<includes>
<include>org.apache.hop:hop-assemblies-static: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-engines-beam:zip</include>
- <include>org.apache.hop:hop-ui-rcp:zip</include>
</includes>
<unpack>true</unpack>
<outputDirectory>.</outputDirectory>
@@ -49,6 +45,25 @@
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
+ <!-- hop-core, hop-engine, hop-ui and hop-ui-rcp with their runtime
dependencies.
+ The SWT natives go to lib/swt below, one per platform. -->
+ <dependencySet>
+ <includes>
+ <include>org.apache.hop:hop-core:jar</include>
+ <include>org.apache.hop:hop-engine:jar</include>
+ <include>org.apache.hop:hop-ui:jar</include>
+ <include>org.apache.hop:hop-ui-rcp:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.eclipse.platform:org.eclipse.swt*</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib/core</outputDirectory>
+ </dependencySet>
+
<!-- swt -->
<dependencySet>
<includes>
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index 9199d6201f..8ff3994788 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -40,5 +40,8 @@
<properties>
<assembly.dir>${project.build.directory}/assembly</assembly.dir>
+ <!-- Nothing under assemblies/ is deployed except hop-client, which
sets this back to
+ false and deploys a flattened POM that does not reference this
parent. -->
+ <maven.deploy.skip>true</maven.deploy.skip>
</properties>
</project>
diff --git a/core/pom.xml b/core/pom.xml
index ed0c476294..1b09d90f38 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,6 @@
<name>Hop Core</name>
<properties>
- <assembly_package-phase>none</assembly_package-phase>
<batik.version>1.19</batik.version>
</properties>
@@ -554,19 +553,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>assemblies</id>
- <activation>
- <property>
- <name>assemblies</name>
- <value>!false</value>
- </property>
- </activation>
- <properties>
- <assembly_package-phase>package</assembly_package-phase>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/core/src/assembly/assembly.xml b/core/src/assembly/assembly.xml
deleted file mode 100644
index bd345f0895..0000000000
--- a/core/src/assembly/assembly.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0
http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>hop-core</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>lib/core</baseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>.</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git
a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/checking-a-release.adoc
b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/checking-a-release.adoc
index e8a4af4441..921beed29a 100644
---
a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/checking-a-release.adoc
+++
b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/checking-a-release.adoc
@@ -177,6 +177,19 @@ export
NEXUS_REPO_URL='https://repository.apache.org/content/repositories/orgapa
Do not use prune on a partial install. Restart Hop after install. Drop the
staging
repository if this was only a dry-run validation.
+== Client zip (Nexus staging)
+
+The client is also staged in Nexus, and the release manager copies that same
file to
+dist.apache.org. Check that the two match:
+
+[source,bash]
+----
+curl -s
https://repository.apache.org/content/repositories/orgapachehop-XXXX/org/apache/hop/hop-client/X.XX/hop-client-X.XX.zip
| sha512sum
+cat apache-hop-client-X.XX.zip.sha512
+----
+
+Both should print the same checksum.
+
== Extra checks
You can also check for unwanted binary files on the checked out tag (note:
this requires the .git folder to still be present)
diff --git
a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/creating-a-release.adoc
b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/creating-a-release.adoc
index 600654528f..de6517586e 100644
---
a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/creating-a-release.adoc
+++
b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/creating-a-release.adoc
@@ -68,28 +68,33 @@ Two independent switches control this, and mixing them up
is what breaks the mar
|Property |Gates
|`assemblies`
-|The `assemblies/` reactor — `hop-assemblies-plugins` and the hop-client /
hop-web
-products — plus the `hop-core` / `hop-engine` / `hop-ui` / `hop-ui-rcp` zips,
which exist
-only to be unpacked into those products. None of these are staged to Maven
Central; the
-client and the source release go to dist.apache.org. The release turns this
off via
-`-P=-assemblies`, so a normal build still produces everything
`assemblies/client` needs.
+|The `assemblies/` reactor: `hop-client`, `hop-assemblies-web` (`hop.war`),
+`hop-assemblies-plugins`, `hop-assemblies-static` and `hop-assemblies-debug`.
The release
+builds it, and only `hop-client` is deployed. The `assemblies` parent sets
+`maven.deploy.skip`, and `hop-client` switches it back off.
|`module.zips`
|The per-module `artifactId-version.zip` attached next to each plugin jar.
This is the
artifact the marketplace installs, so a release must **never** disable it.
|===
-Net effect on a release: every plugin zip is staged, and no `hop-assemblies-*`
or
-core/engine/ui/rcp zip is.
+Net effect on a release: every plugin zip is staged, and so is
`hop-client-<version>.zip`.
+The other `assemblies/` modules are built but not staged.
+
+The staged `hop-client` POM is flattened: it has no parent and no
dependencies, so
+`org.apache.hop:hop-client:<version>:zip` resolves on its own. Its
dependencies are only
+inputs for the assembly and are left out of the deployed POM.
They used to share the single `assemblies` property, so one
`-Dassemblies=false` silently
dropped every plugin zip while the build still reported `BUILD SUCCESS`. That
is why the
zips are missing from Maven Central for 2.12.0-2.14.0 and 2.16.0-2.18.1.
-WARNING: Do not add `-Dassemblies=false`, `-Dmodule.zips=false` or
`-P=-assembly` to the
-release commands, and do not pass `-Darguments="..."` on the command line — it
replaces the
-`<arguments>` configured in the root pom wholesale, taking the
`-P=-assemblies` with it.
-Older versions of this guide included both; that is the bug described above.
+WARNING: Do not add `-Dmodule.zips=false` or `-P=-assembly` (singular) to the
release
+commands: either one drops every plugin zip while the build still reports
`BUILD SUCCESS`.
+Do not add `-Dassemblies=false` or `-P=-assemblies` (plural) either: that
leaves
+`hop-client` out of the staging repository. And do not pass
`-Darguments="..."` on the
+command line, because it replaces the `<arguments>` configured in the root pom
wholesale.
+Older versions of this guide passed `-P=-assemblies`; the root pom no longer
does.
So `release:perform` publishes both the jar and the zip under the same GAV,
for example:
@@ -157,7 +162,8 @@ After the `release:perform` operation a staging repository
will have been create
* Go to the https://repository.apache.org/#stagingRepositories[Nexus staging
repository] (Use your ASF credentials to log in)
* Find Staged release its name will be orgapachehop-<number>
-* Do a quick check the repository contains the artifacts
+* Do a quick check the repository contains the artifacts, including
+`org/apache/hop/hop-client/<version>/hop-client-<version>.zip`
* Select the repository and click on the Close button
* Description when closing: Prepare Apache Hop <version>-rc<number> release
* After a while, the status will go from open to closed
@@ -216,22 +222,18 @@ sha512sum -c apache-hop-X.XX-src.tar.gz.sha512
=== Creating the client
-The client included in the release has to be build using the source code in
the release.
-Use the source you just prepared to generate the client.
+Use the client that `release:perform` built and staged in Nexus. It was built
from the
+release tag, and copying it means dist.apache.org and Maven Central serve the
same file.
+`release:perform` leaves it in `target/checkout` of the folder you ran it from.
[source,bash]
----
-# Copy source to temp build location
-cd apache-hop-X.XX/
+# Copy the staged client (and rename)
+cp <release working
dir>/target/checkout/assemblies/client/target/hop-client-X.XX.zip
apache-hop-client-X.XX.zip
-# Run Build
-mvn -T 4 clean install -DskipTests=true
-
-# Copy client back (and rename)
-cp assemblies/client/target/hop-client-X.XX.zip ../apache-hop-client-X.XX.zip
-
-# Go back to root of your working dir
-cd ..
+# Check it is the same file as the one in the staging repository
+curl -s
https://repository.apache.org/content/repositories/orgapachehop-XXXX/org/apache/hop/hop-client/X.XX/hop-client-X.XX.zip
| sha512sum
+sha512sum apache-hop-client-X.XX.zip
----
As we now added a new binary file we also need to sign and create a sha512 for
it.
diff --git
a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
index 64edcb3c63..47106a26e7 100644
---
a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
+++
b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
@@ -71,10 +71,9 @@ svn commit -m 'Move release files for Apache hop 1.2.0-rc1'
== Creating Dockerhub Artifacts
-To create the docker images you can use the build used to create the client,
go to the folder with the code and do following steps
-
-first take a copy of the source code release and build the software
-(could be that you still have the build from the creating a release steps)
+To create the docker images you can use the build that created the client: the
+`target/checkout` folder `release:perform` left behind. Go to that folder and
do the following steps.
+If it is gone, take a copy of the source code release and build the software
first.
[source,bash]
----
diff --git a/engine/pom.xml b/engine/pom.xml
index f63e55c4c6..ce740f56a2 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -29,7 +29,6 @@
<name>Hop Engine</name>
<properties>
- <assembly_package-phase>none</assembly_package-phase>
<commons-validator.version>1.11.0</commons-validator.version>
<mina.core.version>2.2.9</mina.core.version>
</properties>
@@ -290,19 +289,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>assemblies</id>
- <activation>
- <property>
- <name>assemblies</name>
- <value>!false</value>
- </property>
- </activation>
- <properties>
- <assembly_package-phase>package</assembly_package-phase>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/engine/src/assembly/assembly.xml b/engine/src/assembly/assembly.xml
deleted file mode 100644
index 930be2ce2b..0000000000
--- a/engine/src/assembly/assembly.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0
http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>hop-engine</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>lib/core</baseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>.</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index eb36022735..55816b85c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
<commonmark.version>0.30.1</commonmark.version>
<cyclonedx-maven-plugin.version>2.9.3</cyclonedx-maven-plugin.version>
<error-prone-annotations.version>2.50.0</error-prone-annotations.version>
+ <flatten-maven-plugin.version>1.8.0</flatten-maven-plugin.version>
<gib.buildUpstream>always</gib.buildUpstream>
<!-- Build the upstreams of every impacted module, not only of the
directly changed
ones. With the default (changed), a REST change selects
hop-tech-opensearch as
@@ -366,7 +367,7 @@
committed and checked by CI on every merge, so a
release has nothing to
regenerate. Leaving it on would either do nothing or
quietly put
unreviewed documentation changes into the release
commit. -->
- <arguments>-P=-assemblies -Dconfig-doc=false
-DskipTests</arguments>
+ <arguments>-Dconfig-doc=false -DskipTests</arguments>
</configuration>
</plugin>
<plugin>
@@ -1069,7 +1070,7 @@
<fromDir>${project.basedir}/local-snapshots-dir</fromDir>
<includes>**</includes>
<!-- Comma-separated Ant patterns (single excludes
element). -->
-
<excludes>**/hop-assemblies*/**,hop-core/**/*.zip,hop-engine/**/*.zip,hop-ui/**/*.zip,hop-ui-rap/**/*.zip,hop-ui-rcp/**/*.zip,**/org.eclipse.tm4e.core/**</excludes>
+
<excludes>**/hop-assemblies*/**,hop-ui-rap/**/*.zip,**/org.eclipse.tm4e.core/**</excludes>
<serverId>apache.snapshots.https</serverId>
<url>${distMgmtSnapshotsUrl}</url>
</configuration>
diff --git a/rcp/pom.xml b/rcp/pom.xml
index b0df7a2eec..8b4cd7d96c 100644
--- a/rcp/pom.xml
+++ b/rcp/pom.xml
@@ -30,7 +30,6 @@
<name>Hop GUI (RCP fragment)</name>
<properties>
- <assembly_package-phase>none</assembly_package-phase>
<jface.text.version>3.31.100</jface.text.version>
</properties>
@@ -98,19 +97,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>assemblies</id>
- <activation>
- <property>
- <name>assemblies</name>
- <value>!false</value>
- </property>
- </activation>
- <properties>
- <assembly_package-phase>package</assembly_package-phase>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/rcp/src/assembly/assembly.xml b/rcp/src/assembly/assembly.xml
deleted file mode 100644
index 47eff8830f..0000000000
--- a/rcp/src/assembly/assembly.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0
http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>hop-ui-rcp</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>lib/core</baseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>runtime</scope>
- <outputDirectory>.</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/ui/pom.xml b/ui/pom.xml
index 95c9ba5a2f..ad97e78a01 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -29,7 +29,6 @@
<name>Hop GUI</name>
<properties>
- <assembly_package-phase>none</assembly_package-phase>
<jediterm.version>3.76</jediterm.version>
<pty4j.version>0.14.0</pty4j.version>
<xmlgraphics-commons.version>2.11</xmlgraphics-commons.version>
@@ -158,19 +157,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>assemblies</id>
- <activation>
- <property>
- <name>assemblies</name>
- <value>!false</value>
- </property>
- </activation>
- <properties>
- <assembly_package-phase>package</assembly_package-phase>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/ui/src/assembly/assembly.xml b/ui/src/assembly/assembly.xml
deleted file mode 100644
index 1be3089415..0000000000
--- a/ui/src/assembly/assembly.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0
http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>hop-ui</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>lib/core</baseDirectory>
- <dependencySets>
- <dependencySet>
- <excludes>
- <exclude>org.eclipse.platform:*</exclude>
- </excludes>
- <outputDirectory>.</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file