Skip to content

[Feature] Use assembly to build source code via release profile #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SteNicholas merged 4 commits into from
Jun 8, 2024
Merged

[Feature] Use assembly to build source code via release profile #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
842d4af
[Feature] Use assembly to build when profile is release
hdygxsj May 28, 2024
2c0b7fa
[Feature] fix
hdygxsj Jun 7, 2024
62eb2a2
[Feature] fix
hdygxsj Jun 7, 2024
bc9145c
[Feature] fix
hdygxsj Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ paimon-web-ui/components.d.ts
paimon-web-ui/.eslintrc-auto-import.json
paimon-web-ui/httpData
paimon-web-ui/apiWeb.json
paimon-web-server/src/main/resources/static/**
logs/*
.mvn/
.www
Expand All @@ -43,7 +44,7 @@ target
dependency-reduced-pom.xml
*.dependency-reduced-pom.xml
!.idea/paimon.svg

**/dist/**
# Logs
logs
*.log
Expand Down
88 changes: 88 additions & 0 deletions paimon-web-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.
-->
<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.apache.paimon</groupId>
<artifactId>paimon-webui</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>

<artifactId>paimon-web-dist</artifactId>
<name>Paimon : Web : Dist</name>

<dependencies>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-web-server</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<finalName>apache-paimon-webui-${project.version}</finalName>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>paimon-web-bin</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>

<configuration>
<descriptors>
<descriptor>src/main/assembly/paimon-web-bin.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>

<execution>
<id>src</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assembly/paimon-web-src.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>

</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
44 changes: 44 additions & 0 deletions paimon-web-dist/src/main/assembly/paimon-web-bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!--
~ 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.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>bin</id>
<formats>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>${project.build.finalName}-bin</baseDirectory>

<fileSets>
<fileSet>
<directory>${basedir}/../paimon-web-server/target/paimon-web-server</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/../script/sql</directory>
<outputDirectory>conf/sql</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>${basedir}/release-docs</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
86 changes: 86 additions & 0 deletions paimon-web-dist/src/main/assembly/paimon-web-src.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<!--
~ 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/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>src</id>
<formats>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>${project.build.finalName}-src</baseDirectory>

<fileSets>
<fileSet>
<directory>${basedir}/../</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**/*</include>
</includes>
<excludes>
<!-- github ignore -->
<exclude>**/.github/**</exclude>
<exclude>.travis.yml</exclude>

<!-- maven ignore -->
<exclude>**/target/**</exclude>
<exclude>**/*.class</exclude>
<exclude>**/*.jar</exclude>
<exclude>**/*.war</exclude>
<exclude>**/*.zip</exclude>
<exclude>**/*.tar</exclude>
<exclude>**/*.tar.gz</exclude>
<exclude>**/node/**</exclude>
<exclude>**/node_modules/**</exclude>
<exclude>**/dist/**</exclude>

<!-- maven plugin ignore -->
<exclude>release.properties</exclude>
<exclude>**/pom.xml.releaseBackup</exclude>
<exclude>*.gpg</exclude>

<!-- node ignore -->
<exclude>**/paimon-ui/dist/**</exclude>
<exclude>**/paimon-ui/node/**</exclude>
<exclude>**/paimon-ui/node_modules/**</exclude>

<!-- eclipse ignore -->
<exclude>**/.settings/**</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>

<!-- idea ignore -->
<exclude>**/.idea/**</exclude>
<exclude>**/*.ipr</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.iws</exclude>

<!-- temp ignore -->
<exclude>**/logs/**</exclude>
<exclude>**/*.log</exclude>
<exclude>**/*.doc</exclude>
<exclude>**/*.cache</exclude>
<exclude>**/*.diff</exclude>
<exclude>**/*.patch</exclude>
<exclude>**/*.tmp</exclude>

</excludes>
</fileSet>
</fileSets>
</assembly>
34 changes: 8 additions & 26 deletions paimon-web-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ under the License.
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-web-ui</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
Expand Down Expand Up @@ -256,7 +262,7 @@ under the License.
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
<finalName>${project.artifactId}-${project.version}</finalName>
<finalName>${project.artifactId}</finalName>
<resources>
<resource>
<filtering>true</filtering>
Expand Down Expand Up @@ -309,7 +315,7 @@ under the License.
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
<descriptor>src/main/assembly/paimon-web-server.xml</descriptor>
</descriptors>
</configuration>
<executions>
Expand All @@ -323,30 +329,6 @@ under the License.
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven.resource.version}</version>
<executions>
<execution>
<id>copy-static</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>initialize</phase>
<configuration>
<outputDirectory>src/main/resources/static</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>../paimon-web-ui/dist</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
30 changes: 10 additions & 20 deletions ...-web-server/src/main/assembly/package.xml → ...r/src/main/assembly/paimon-web-server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,49 +17,39 @@ specific language governing permissions and limitations
under the License.
-->
<assembly>
<id>dist</id>
<id>server</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!-- <fileSet>-->
<!-- <directory>${basedir}/src/main/bin</directory>-->
<!-- <lineEnding>unix</lineEnding>-->
<!-- <outputDirectory>service</outputDirectory>-->
<!-- <includes>-->
<!-- <include>*.service</include>-->
<!-- </includes>-->
<!-- </fileSet>-->
<fileSet>
<directory>${basedir}/src/main/bin</directory>
<lineEnding>unix</lineEnding>
<outputDirectory/>
<outputDirectory>bin</outputDirectory>
<fileMode>755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/bin</directory>
<lineEnding>windows</lineEnding>
<outputDirectory/>
<includes>
<include>*.bat</include>
</includes>
</fileSet>

<fileSet>
<directory>target/classes</directory>
<outputDirectory>config</outputDirectory>
<includes>
<include>**/*.yml</include>
<include>**/log4j2.xml</include>
<include>**/log4j2-spring.xml</include>
<include>**/*.properties</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/../paimon-web-ui/dist</directory>
<outputDirectory>./ui</outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputDirectory>libs</outputDirectory>
<unpack>false</unpack>
</dependencySet>
</dependencySets>
Expand Down
29 changes: 29 additions & 0 deletions paimon-web-server/src/main/bin/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash
#
# 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.
#

# Set the FLINK_HOME directory to execute the flink command to submit the cdc job.
FLINK_HOME=

# Set the ACTION_JAR_PATH to execute the paimon action job.
ACTION_JAR_PATH=

JVM_ARGS="-server"

JAVA_OPTS=${JAVA_OPTS:-"${JVM_ARGS}"}

JAVA_HOME=
Loading