Skip to content

Commit

Permalink
update version to 1.2.4 (#1035)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wolfboys
wolfboys committed May 16, 2022
1 parent d114fc6 commit 3ebdaf2
Show file tree
Hide file tree
Showing 50 changed files with 154 additions and 178 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>StreamX Parent</name>
<description>A magical framework that make stream processing easier</description>
Expand Down
2 changes: 1 addition & 1 deletion streamx-common/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion streamx-common/src/main/scala/com/streamxhub/streamx/common/conf/ConfigConst.scala
View file
Expand Up @@ -301,7 +301,7 @@ object ConfigConst {
println("\n WebSite: http://www.streamxhub.com ")
println(" GitHub : https://github.com/streamxhub/streamx ")
println(" Gitee : https://gitee.com/streamxhub/streamx ")
println(" Ver : 1.2.3 ")
println(" Ver : 1.2.4 ")
println(s" Info : $info ")
println(s" Time : ${LocalDateTime.now} \n\n")
// scalastyle:on println
Expand Down
2 changes: 1 addition & 1 deletion streamx-console/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>streamx-console</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions streamx-console/streamx-console-service/pom.xml
View file
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-console</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>streamx-console-service</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
<name>StreamX : Console Service</name>

<!-- 定义统一版本号-->
Expand Down
6 changes: 3 additions & 3 deletions ...console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java
View file
Expand Up @@ -43,8 +43,8 @@
import com.streamxhub.streamx.console.core.metrics.flink.Overview;
import com.streamxhub.streamx.console.core.metrics.yarn.AppInfo;
import com.streamxhub.streamx.flink.kubernetes.model.K8sPodTemplates;
import com.streamxhub.streamx.flink.packer.maven.Artifact;
import com.streamxhub.streamx.flink.packer.maven.DependencyInfo;
import com.streamxhub.streamx.flink.packer.maven.MavenArtifact;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
Expand Down Expand Up @@ -825,8 +825,8 @@ public boolean eq(Dependency other) {

@JsonIgnore
public DependencyInfo toJarPackDeps() {
List<MavenArtifact> mvnArts = this.pom.stream()
.map(pom -> new MavenArtifact(pom.getGroupId(), pom.getArtifactId(), pom.getVersion()))
List<Artifact> mvnArts = this.pom.stream()
.map(pom -> new Artifact(pom.getGroupId(), pom.getArtifactId(), pom.getVersion()))
.collect(Collectors.toList());
List<String> extJars = this.jar.stream()
.map(jar -> Workspace.local().APP_UPLOADS() + "/" + jar)
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-base/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-base_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-clickhouse/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-clickhouse_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-doris/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-doris_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-elasticsearch/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-elasticsearch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...ctor/streamx-flink-connector-elasticsearch/streamx-flink-connector-elasticsearch5/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector-elasticsearch</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-elasticsearch5_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...ctor/streamx-flink-connector-elasticsearch/streamx-flink-connector-elasticsearch6/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector-elasticsearch</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-elasticsearch6_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...ctor/streamx-flink-connector-elasticsearch/streamx-flink-connector-elasticsearch7/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>streamx-flink-connector-elasticsearch</artifactId>
<groupId>com.streamxhub.streamx</groupId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-hbase/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-hbase_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-http/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-http_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-influx/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-influx_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-jdbc/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-jdbc_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-kafka/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-kafka_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-mongo/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-mongo_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-connector/streamx-flink-connector-redis/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-connector_${scala.binary.version}</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-connector-redis_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-core/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-core_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-shims/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-shims</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-shims/streamx-flink-shims-base/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-shims</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-shims-base_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-shims/streamx-flink-shims_flink-1.12/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-shims</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-shims_flink-1.12_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-shims/streamx-flink-shims_flink-1.13/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-shims</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-shims_flink-1.13_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-shims/streamx-flink-shims_flink-1.14/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-shims</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-shims_flink-1.14_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-flink/streamx-flink-shims/streamx-flink-shims_flink-1.15/pom.xml
View file
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-flink-shims</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-shims_flink-1.15_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-plugin/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>streamx-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-plugin/streamx-flink-kubernetes/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-plugin</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-kubernetes_${scala.binary.version}</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamx-plugin/streamx-flink-packer/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.streamxhub.streamx</groupId>
<artifactId>streamx-plugin</artifactId>
<version>1.2.3</version>
<version>1.2.4-SNAPSHOT</version>
</parent>

<artifactId>streamx-flink-packer_${scala.binary.version}</artifactId>
Expand Down
29 changes: 22 additions & 7 deletions ...mx/flink/packer/maven/MavenArtifact.scala → ...streamx/flink/packer/maven/Artifact.scala
View file
Expand Up @@ -20,22 +20,37 @@
package com.streamxhub.streamx.flink.packer.maven

import java.util.regex.Pattern
import org.eclipse.aether.artifact.{Artifact => AetherArtifact}

case class MavenArtifact(groupId: String, artifactId: String, version: String)
case class Artifact(groupId: String, artifactId: String, version: String) {

def eq(artifact: AetherArtifact): Boolean = {
artifact.getGroupId match {
case g if g == groupId =>
artifact.getArtifactId match {
case "*" => true
case a => a == artifactId
}
case _ => false
}
}

}

object Artifact {

object MavenArtifact {
private lazy val PATTERN = Pattern.compile("([^: ]+):([^: ]+):([^: ]+)")

/**
* build from coords
*/
def of(coords: String): MavenArtifact = {
def of(coords: String): Artifact = {
PATTERN.matcher(coords) match {
case m if m.matches() =>
val groupId = m.group(1)
val artifactId = m.group(2)
val version = m.group(3)
MavenArtifact(groupId, artifactId, version)
val g = m.group(1)
val a = m.group(2)
val v = m.group(3)
Artifact(g, a, v)
case _ =>
throw new IllegalArgumentException(s"Bad artifact coordinates $coords, expected format is <groupId>:<artifactId>[:<extension>[:<classifier>]]:<version>")
}
Expand Down
4 changes: 2 additions & 2 deletions ...link-packer/src/main/scala/com/streamxhub/streamx/flink/packer/maven/DependencyInfo.scala
View file
Expand Up @@ -27,10 +27,10 @@ import scala.collection.JavaConversions._
* @param mavenArts collection of maven artifacts
* @param extJarLibs collection of jar lib paths, which elements can be a directory or file path.
*/
case class DependencyInfo(mavenArts: Set[MavenArtifact] = Set(),
case class DependencyInfo(mavenArts: Set[Artifact] = Set(),
extJarLibs: Set[String] = Set()) {

def this(mavenArts: JavaList[MavenArtifact], extJarLibs: JavaList[String]) {
def this(mavenArts: JavaList[Artifact], extJarLibs: JavaList[String]) {
this(mavenArts.toSet, extJarLibs.toSet)
}

Expand Down

0 comments on commit 3ebdaf2

Please sign in to comment.