Skip to content

The Unified and Autonomous Development Platform

Code cleanup for various default ci spec provider plugins

Robin Shen10ddf753cdb3
diff --git a/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
index 3aa36c3792..5f36c986f3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
@@ -19,6 +19,7 @@ public class AutoDiscoveredJobExecutor extends JobExecutor {
@Override
public void execute(String jobToken, JobContext context) {
+ context.getLogger().log("Discovering appropriate job executor...");
List<JobExecutor> jobExecutors = new ArrayList<>();
for (JobExecutorDiscoverer discoverer: OneDev.getExtensions(JobExecutorDiscoverer.class)) {
JobExecutor jobExecutor = discoverer.discover();
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index 53ab7fbb36..21d4e0eabf 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -1,33 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin</artifactId>
- <packaging>pom</packaging>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server</artifactId>
- <version>3.0.1</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <modules>
- <module>server-plugin-archetype</module>
- <module>server-plugin-artifact</module>
- <module>server-plugin-htmlreport</module>
- <module>server-plugin-maven</module>
- <module>server-plugin-kubernetes</module>
- <module>server-plugin-serverdocker</module>
- <module>server-plugin-node</module>
- <module>server-plugin-laravel</module>
- <module>server-plugin-asp.net</module>
- <module>server-plugin-angular</module>
- <module>server-plugin-rubyonrails</module>
- <module>server-plugin-django</module>
- <module>server-plugin-android</module>
- </modules>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-plugin</artifactId>
+ <packaging>pom</packaging>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server</artifactId>
+ <version>3.0.1</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <modules>
+ <module>server-plugin-archetype</module>
+ <module>server-plugin-artifact</module>
+ <module>server-plugin-htmlreport</module>
+ <module>server-plugin-maven</module>
+ <module>server-plugin-kubernetes</module>
+ <module>server-plugin-serverdocker</module>
+ <module>server-plugin-node</module>
+ <module>server-plugin-laravel</module>
+ <module>server-plugin-rubyonrails</module>
+ <module>server-plugin-django</module>
+ <module>server-plugin-gradle</module>
+ </modules>
+</project>
diff --git a/server-plugin/server-plugin-android/pom.xml b/server-plugin/server-plugin-gradle/pom.xml
similarity index 75%
rename from server-plugin/server-plugin-android/pom.xml
rename to server-plugin/server-plugin-gradle/pom.xml
index a9fb2c7f43..90c88a4e23 100644
--- a/server-plugin/server-plugin-android/pom.xml
+++ b/server-plugin/server-plugin-gradle/pom.xml
@@ -1,13 +1,13 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-android</artifactId>
+ <artifactId>server-plugin-gradle</artifactId>
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>org.server.plugin.android.AndroidModule</moduleClass>
+ <moduleClass>org.server.plugin.gradle.GradleModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/DefaultAndriodCISpecProvider.java b/server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/DefaultGradleCISpecProvider.java
similarity index 93%
rename from server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/DefaultAndriodCISpecProvider.java
rename to server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/DefaultGradleCISpecProvider.java
index 8b9f974a5c..b321b9920e 100644
--- a/server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/DefaultAndriodCISpecProvider.java
+++ b/server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/DefaultGradleCISpecProvider.java
@@ -1,4 +1,4 @@
-package org.server.plugin.android;
+package org.server.plugin.gradle;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.FileMode;
@@ -13,7 +13,7 @@ import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
-public class DefaultAndriodCISpecProvider implements DefaultCISpecProvider {
+public class DefaultGradleCISpecProvider implements DefaultCISpecProvider {
@Override
diff --git a/server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/AndroidModule.java b/server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/GradleModule.java
similarity index 63%
rename from server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/AndroidModule.java
rename to server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/GradleModule.java
index dd4d058753..a216867059 100644
--- a/server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/AndroidModule.java
+++ b/server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/GradleModule.java
@@ -1,4 +1,4 @@
-package org.server.plugin.android;
+package org.server.plugin.gradle;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.server.ci.DefaultCISpecProvider;
@@ -7,14 +7,14 @@ import io.onedev.server.ci.DefaultCISpecProvider;
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
*
*/
-public class AndroidModule extends AbstractPluginModule {
+public class GradleModule extends AbstractPluginModule {
@Override
protected void configure() {
super.configure();
// put your guice bindings here
- contribute(DefaultCISpecProvider.class, DefaultAndriodCISpecProvider.class);
+ contribute(DefaultCISpecProvider.class, DefaultGradleCISpecProvider.class);
}
}
diff --git a/server-plugin/server-plugin-laravel/pom.xml b/server-plugin/server-plugin-laravel/pom.xml
index 492d52009d..bc0cdae61e 100644
--- a/server-plugin/server-plugin-laravel/pom.xml
+++ b/server-plugin/server-plugin-laravel/pom.xml
@@ -8,14 +8,6 @@
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.laravel.PluginModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.laravel.LaravelPluginModule</moduleClass>
</properties>
-
- <dependencies>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-node</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/PluginModule.java b/server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/LaravelPluginModule.java
similarity index 87%
rename from server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/PluginModule.java
rename to server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/LaravelPluginModule.java
index e6a19282ca..e44614e55e 100644
--- a/server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/PluginModule.java
+++ b/server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/LaravelPluginModule.java
@@ -7,7 +7,7 @@ import io.onedev.server.ci.DefaultCISpecProvider;
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
*
*/
-public class PluginModule extends AbstractPluginModule {
+public class LaravelPluginModule extends AbstractPluginModule {
@Override
protected void configure() {
diff --git a/server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/DefaultMavenCISpecProvider.java b/server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/DefaultMavenCISpecProvider.java
index 86b6da3a8c..e45aac567e 100644
--- a/server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/DefaultMavenCISpecProvider.java
+++ b/server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/DefaultMavenCISpecProvider.java
@@ -63,18 +63,13 @@ public class DefaultMavenCISpecProvider implements DefaultCISpecProvider {
Job job = new Job();
job.setName("ci");
-
- switch (javaVersion) {
- case "13":
- job.setEnvironment("maven:3.6.1-jdk-13");
- break;
- case "12":
- job.setEnvironment("maven:3.6.1-jdk-12");
- break;
- case "11":
- job.setEnvironment("maven:3.6.1-jdk-11");
- break;
- default:
+
+ try {
+ if (Integer.parseInt(javaVersion) <= 8)
+ job.setEnvironment("maven:3.6.1-jdk-8");
+ else
+ job.setEnvironment("maven:latest");
+ } catch (NumberFormatException e) {
job.setEnvironment("maven:3.6.1-jdk-8");
}
diff --git a/server-plugin/server-plugin-node/pom.xml b/server-plugin/server-plugin-node/pom.xml
index cde9245787..c77a7c648e 100644
--- a/server-plugin/server-plugin-node/pom.xml
+++ b/server-plugin/server-plugin-node/pom.xml
@@ -8,7 +8,7 @@
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.node.PluginModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.node.NodePluginModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/PluginModule.java b/server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/NodePluginModule.java
similarity index 88%
rename from server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/PluginModule.java
rename to server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/NodePluginModule.java
index d84b2ea421..982041597a 100644
--- a/server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/PluginModule.java
+++ b/server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/NodePluginModule.java
@@ -7,7 +7,7 @@ import io.onedev.server.ci.DefaultCISpecProvider;
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
*
*/
-public class PluginModule extends AbstractPluginModule {
+public class NodePluginModule extends AbstractPluginModule {
@Override
protected void configure() {
diff --git a/server-plugin/server-plugin-rubyonrails/pom.xml b/server-plugin/server-plugin-rubyonrails/pom.xml
index 626dcd8a19..980137e0f7 100644
--- a/server-plugin/server-plugin-rubyonrails/pom.xml
+++ b/server-plugin/server-plugin-rubyonrails/pom.xml
@@ -8,6 +8,6 @@
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>org.server.plugin.rubyonrails.PluginModule</moduleClass>
+ <moduleClass>org.server.plugin.rubyonrails.RORPluginModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRubyCISpecProvider.java b/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRORCISpecProvider.java
similarity index 94%
rename from server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRubyCISpecProvider.java
rename to server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRORCISpecProvider.java
index 5c92c9c9ad..c7d7b558e5 100644
--- a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRubyCISpecProvider.java
+++ b/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRORCISpecProvider.java
@@ -13,7 +13,7 @@ import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
-public class DefaultRubyCISpecProvider implements DefaultCISpecProvider {
+public class DefaultRORCISpecProvider implements DefaultCISpecProvider {
@Override
diff --git a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/PluginModule.java b/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/RORPluginModule.java
similarity index 70%
rename from server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/PluginModule.java
rename to server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/RORPluginModule.java
index 1d7c22653d..c57a2aac13 100644
--- a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/PluginModule.java
+++ b/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/RORPluginModule.java
@@ -7,14 +7,14 @@ import io.onedev.server.ci.DefaultCISpecProvider;
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
*
*/
-public class PluginModule extends AbstractPluginModule {
+public class RORPluginModule extends AbstractPluginModule {
@Override
protected void configure() {
super.configure();
// put your guice bindings here
- contribute(DefaultCISpecProvider.class, DefaultRubyCISpecProvider.class);
+ contribute(DefaultCISpecProvider.class, DefaultRORCISpecProvider.class);
}
}
diff --git a/server-product/pom.xml b/server-product/pom.xml
index ecec843b54..f782d4fa03 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-android</artifactId>
+ <artifactId>server-plugin-gradle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>