Skip to content
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

Jump to bottom

[Build] Remove connector/seatunnel directory #5489

Merged
merged 5 commits into from
Sep 15, 2023
Merged

[Build] Remove connector/seatunnel directory #5489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b55889b
[Build] Remove `connector/seatunnel` directory
Hisoka-X Sep 14, 2023
7f9430e
update
Hisoka-X Sep 14, 2023
7728275
update
Hisoka-X Sep 14, 2023
6cc967e
update
Hisoka-X Sep 15, 2023
3645336
update
Hisoka-X Sep 15, 2023
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
8 changes: 1 addition & 7 deletions bin/install-plugin.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,12 @@ if not exist "%SEATUNNEL_HOME%\connectors" (
echo create connectors directory
)

REM Create the seatunnel connectors directory (for v2)
if not exist "%SEATUNNEL_HOME%\connectors\seatunnel" (
mkdir "%SEATUNNEL_HOME%\connectors\seatunnel"
echo create seatunnel connectors directory
)

for /f "usebackq delims=" %%a in ("%SEATUNNEL_HOME%\config\plugin_config") do (
set "line=%%a"
setlocal enabledelayedexpansion
if "!line:~0,1!" neq "-" if "!line:~0,1!" neq "#" (
echo install connector : !line!
call "%SEATUNNEL_HOME%\mvnw.cmd" dependency:get -DgroupId="org.apache.seatunnel" -DartifactId="!line!" -Dversion="%version%" -Ddest="%SEATUNNEL_HOME%\connectors\seatunnel"
call "%SEATUNNEL_HOME%\mvnw.cmd" dependency:get -DgroupId="org.apache.seatunnel" -DartifactId="!line!" -Dversion="%version%" -Ddest="%SEATUNNEL_HOME%\connectors"
)
endlocal
)
9 changes: 1 addition & 8 deletions bin/install-plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,11 @@ if [ ! -d ${SEATUNNEL_HOME}/connectors ];
echo "create connectors directory"
fi

# create the seatunnel connectors directory (for v2)
if [ ! -d ${SEATUNNEL_HOME}/connectors/seatunnel ];
then
mkdir ${SEATUNNEL_HOME}/connectors/seatunnel
echo "create seatunnel connectors directory"
fi

while read line; do
if [ ${line:0:1} != "-" ] && [ ${line:0:1} != "#" ]
then
echo "install connector : " $line
${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=org.apache.seatunnel -DartifactId=${line} -Dversion=${version} -Ddest=${SEATUNNEL_HOME}/connectors/seatunnel
${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=org.apache.seatunnel -DartifactId=${line} -Dversion=${version} -Ddest=${SEATUNNEL_HOME}/connectors
fi

done < ${SEATUNNEL_HOME}/config/plugin_config
5 changes: 0 additions & 5 deletions seatunnel-common/src/main/java/org/apache/seatunnel/common/config/Common.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@ public static Path pluginRootDir() {
return Paths.get(getSeaTunnelHome(), "plugins");
}

/** Plugin Connector Jar Dir */
public static Path connectorJarDir(String engine) {
return Paths.get(getSeaTunnelHome(), "connectors", engine.toLowerCase());
}

/** Plugin Connector Dir */
public static Path connectorDir() {
return Paths.get(getSeaTunnelHome(), "connectors");
Expand Down
4 changes: 2 additions & 2 deletions ...l-spark-2-starter/src/main/java/org/apache/seatunnel/core/starter/spark/SparkStarter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ static Map<String, String> getSparkConf(String configFile) throws FileNotFoundEx
Map.Entry::getKey, e -> e.getValue().unwrapped().toString()));
}

/** return connector's jars, which located in 'connectors/spark/*'. */
/** return connector's jars, which located in 'connectors/*'. */
private List<Path> getConnectorJarDependencies() {
Path pluginRootDir = Common.connectorJarDir("seatunnel");
Path pluginRootDir = Common.connectorDir();
if (!Files.exists(pluginRootDir) || !Files.isDirectory(pluginRootDir)) {
return Collections.emptyList();
}
Expand Down
4 changes: 2 additions & 2 deletions ...rk-starter-common/src/main/java/org/apache/seatunnel/core/starter/spark/SparkStarter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ static Map<String, String> getSparkConf(String configFile) throws FileNotFoundEx
Map.Entry::getKey, e -> e.getValue().unwrapped().toString()));
}

/** return connector's jars, which located in 'connectors/spark/*'. */
/** return connector's jars, which located in 'connectors/*'. */
private List<Path> getConnectorJarDependencies() {
Path pluginRootDir = Common.connectorJarDir("seatunnel");
Path pluginRootDir = Common.connectorDir();
if (!Files.exists(pluginRootDir) || !Files.isDirectory(pluginRootDir)) {
return Collections.emptyList();
}
Expand Down
2 changes: 1 addition & 1 deletion seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<exclude>org.apache.seatunnel:connector-file-base-hadoop</exclude>
<exclude>org.apache.seatunnel:connector-cdc-base</exclude>
</excludes>
<outputDirectory>/connectors/seatunnel</outputDirectory>
<outputDirectory>/connectors</outputDirectory>
<scope>provided</scope>
</dependencySet>

Expand Down
2 changes: 1 addition & 1 deletion seatunnel-dist/src/main/assembly/assembly-bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<include>org.apache.seatunnel:connector-fake:jar</include>
<include>org.apache.seatunnel:connector-console:jar</include>
</includes>
<outputDirectory>/connectors/seatunnel</outputDirectory>
<outputDirectory>/connectors</outputDirectory>
<scope>provided</scope>
</dependencySet>
</dependencySets>
Expand Down
3 changes: 1 addition & 2 deletions ...eatunnel-e2e-common/src/test/java/org/apache/seatunnel/e2e/common/util/ContainerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ public static void copyConnectorJarToContainer(
jar ->
container.copyFileToContainer(
MountableFile.forHostPath(jar.getAbsolutePath()),
Paths.get(seatunnelHome, "connectors", connectorType, jar.getName())
.toString()));
Paths.get(seatunnelHome, "connectors", jar.getName()).toString()));
}

public static String copyConfigFileToContainer(GenericContainer<?> container, String confFile) {
Expand Down
12 changes: 4 additions & 8 deletions ...iscovery/src/main/java/org/apache/seatunnel/plugin/discovery/AbstractPluginDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,12 @@ public abstract class AbstractPluginDiscovery<T> implements PluginDiscovery<T> {
protected final ConcurrentHashMap<PluginIdentifier, Optional<URL>> pluginJarPath =
new ConcurrentHashMap<>(Common.COLLECTION_SIZE);

public AbstractPluginDiscovery(
String pluginSubDir, BiConsumer<ClassLoader, URL> addURLToClassloader) {
this(
Common.connectorJarDir(pluginSubDir),
loadConnectorPluginConfig(),
addURLToClassloader);
public AbstractPluginDiscovery(BiConsumer<ClassLoader, URL> addURLToClassloader) {
this(Common.connectorDir(), loadConnectorPluginConfig(), addURLToClassloader);
}

public AbstractPluginDiscovery(String pluginSubDir) {
this(Common.connectorJarDir(pluginSubDir), loadConnectorPluginConfig());
public AbstractPluginDiscovery() {
this(Common.connectorDir(), loadConnectorPluginConfig());
}

public AbstractPluginDiscovery(Path pluginDir) {
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/apache/seatunnel/plugin/discovery/seatunnel/SeaTunnelSinkPluginDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
public class SeaTunnelSinkPluginDiscovery extends AbstractPluginDiscovery<SeaTunnelSink> {

public SeaTunnelSinkPluginDiscovery() {
super("seatunnel");
super();
}

public SeaTunnelSinkPluginDiscovery(BiConsumer<ClassLoader, URL> addURLToClassLoader) {
super("seatunnel", addURLToClassLoader);
super(addURLToClassLoader);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/apache/seatunnel/plugin/discovery/seatunnel/SeaTunnelSourcePluginDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
public class SeaTunnelSourcePluginDiscovery extends AbstractPluginDiscovery<SeaTunnelSource> {

public SeaTunnelSourcePluginDiscovery() {
super("seatunnel");
super();
}

public SeaTunnelSourcePluginDiscovery(BiConsumer<ClassLoader, URL> addURLToClassLoader) {
super("seatunnel", addURLToClassLoader);
super(addURLToClassLoader);
}

@Override
Expand Down
Loading