You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/09/16 15:35:14 UTC
[incubator-streampark] branch dev updated: [hotfix] fix missing jar streampark-flink-shims_flink. (#1621)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new d80fdc412 [hotfix] fix missing jar streampark-flink-shims_flink. (#1621)
d80fdc412 is described below
commit d80fdc412fb78f6328e332bb4eed559e47541b93
Author: gongzhongqiang <76...@qq.com>
AuthorDate: Fri Sep 16 23:35:06 2022 +0800
[hotfix] fix missing jar streampark-flink-shims_flink. (#1621)
* [hotfix] fix missing jar streampark-flink-shims_flink.
* [polish] fix assembly execute twice.
---
.github/workflows/maven.yml | 6 +--
pom.xml | 22 --------
.../streampark-console-service/pom.xml | 61 ++++++++++++++--------
3 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 13ec5376c..60088dc94 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -49,15 +49,15 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up JDK 8
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'adopt'
cache: maven
- name: Build with Maven
- run: mvn -B clean package -T 4 -DskipTests
+ run: mvn -B clean package -DskipTests
- name: Test with Maven
run: mvn -B test -pl '!streampark-plugin/streampark-jvm-profiler,!streampark-console/streampark-console-service' -am
# - name: Setup Go
diff --git a/pom.xml b/pom.xml
index 85252eed3..cc53c13b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -805,28 +805,6 @@
</plugin>
<!--(end) shade -->
- <!--assembly-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
- <executions>
- <execution>
- <id>distro-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
-
<!--source and doc-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/streampark-console/streampark-console-service/pom.xml b/streampark-console/streampark-console-service/pom.xml
index 594e69714..52c9cc38b 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -525,6 +525,27 @@
</artifactItems>
</configuration>
</plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.1</version>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</profile>
@@ -587,7 +608,25 @@
</configuration>
</plugin>
-
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.1</version>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -599,7 +638,6 @@
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -638,25 +676,6 @@
<artifactId>maven-release-plugin</artifactId>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>