Skip to content

Commit

Permalink
Merge branch 'master' into hotfix/tag-error
Browse files Browse the repository at this point in the history
  • Loading branch information
@ascrutae
ascrutae committed Nov 6, 2019
2 parents b09805c + 39d1869 commit b17440c
Show file tree
Hide file tree
Showing 50 changed files with 2,284 additions and 192 deletions.
55 changes: 31 additions & 24 deletions .mvn/wrapper/MavenWrapperDownloader.java
View file
Original file line number Diff line number Diff line change
@@ -1,47 +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.
*/

* Copyright 2007-present the original author or authors.
*
* Licensed 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.
*/
import java.net.*;
import java.io.*;
import java.nio.channels.*;
import java.util.Properties;

public class MavenWrapperDownloader {

private static final String WRAPPER_VERSION = "0.5.5";
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";

/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
* use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
".mvn/wrapper/maven-wrapper.properties";
".mvn/wrapper/maven-wrapper.properties";

/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH =
".mvn/wrapper/maven-wrapper.jar";
".mvn/wrapper/maven-wrapper.jar";

/**
* Name of the property which should be used to override the default download url for the wrapper.
Expand Down Expand Up @@ -76,13 +73,13 @@ public static void main(String args[]) {
}
}
}
System.out.println("- Downloading from: : " + url);
System.out.println("- Downloading from: " + url);

File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if(!outputFile.getParentFile().exists()) {
if(!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
Expand All @@ -98,6 +95,16 @@ public static void main(String args[]) {
}

private static void downloadFileFromURL(String urlString, File destination) throws Exception {
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
String username = System.getenv("MVNW_USERNAME");
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
Authenticator.setDefault(new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(username, password);
}
});
}
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
Expand Down
2 changes: 2 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar

52 changes: 22 additions & 30 deletions Jenkinsfile-Agent-Test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pipeline {
}

environment {
BUILD_NO="wl1_${BUILD_ID}"
MAVEN_OPTS = '-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
}

Expand Down Expand Up @@ -63,12 +64,12 @@ pipeline {
}
}
steps {
sh './mvnw -f test/plugin/pom.xml clean package -DskipTests -Dbuild_id=wl1_${BUILD_ID} docker:build'
sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build'
}
}
stage('Test Cases Report (169)') {
stage('Test Cases Report (136)') {
steps {
echo "reserve."
echo "Test Cases Report"
}
}

Expand All @@ -81,63 +82,54 @@ pipeline {
parallel {
stage('Group1') {
stages {
stage('httpasyncclient 4.0-4.1.3 (7)') {
stage('apm-toolkit-trace (1)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} httpasyncclient-scenario'
sh 'bash test/plugin/run.sh apm-toolkit-trace-scenario'
}
}
stage('httpclient 4.3.x-4.5.x (14)') {

stage('jetty 9.x (63)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} httpclient-4.3.x-scenario'
sh 'bash test/plugin/run.sh jetty-scenario'
}
}

stage('ehcache 2.8.x-2.10.x (19)') {
stage('netty-socketio 1.x (4)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} ehcache-2.x-scenario'
sh 'bash test/plugin/run.sh netty-socketio-scenario'
}
}
}
}

stage('dubbo 2.7.x (4)') {
stage('Group2') {
stages {
stage('customize (1)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} dubbo-2.7.x-scenario'
sh 'bash test/plugin/run.sh customize-scenario'
}
}

stage('spring async 4.3.x-5.1.x (35)') {
stage('postgresql 9.4.1207+ (62)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} spring-async-scenario'
sh 'bash test/plugin/run.sh postgresql-above9.4.1207-scenario'
}
}

stage('netty-socketio 1.x (4)') {
stage('canal 1.0.24-1.1.2 (5)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} netty-socketio-scenario'
sh 'bash test/plugin/run.sh canal-scenario'
}
}
}
}
stage('Group2') {
stages {
stage('jetty 9.x (63)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} jetty-scenario'
}
}
stage('undertow-routing-scenario 1.3.0-2.0.27 (23)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} undertow-routing-scenario'
}
}
}
}
}
}
}

post {
cleanup {
sh 'bash test/plugin/run.sh --build_id=wl1_${BUILD_ID} --cleanup'
sh 'bash test/plugin/run.sh --cleanup'
deleteDir()
}
}
Expand Down
59 changes: 22 additions & 37 deletions Jenkinsfile-Agent-Test-2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pipeline {
}

environment {
BUILD_NO="wl2_${BUILD_ID}"
MAVEN_OPTS = '-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
}

Expand Down Expand Up @@ -63,12 +64,12 @@ pipeline {
}
}
steps {
sh './mvnw -f test/plugin/pom.xml clean package -DskipTests -Dbuild_id=wl2_${BUILD_ID} docker:build'
sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build'
}
}
stage('Test Cases Report (174)') {
stage('Test Cases Report (136)') {
steps {
echo "reserve."
echo "Test Cases Report"
}
}

Expand All @@ -81,65 +82,49 @@ pipeline {
parallel {
stage('Group1') {
stages {
stage('spring-cloud-gateway 2.1.x (3)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} gateway-scenario'
}
}

stage('spring-webflux 2.x (18)') {
stage('spring 4.3.x-5.2.x (54)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} webflux-scenario'
sh 'bash test/plugin/run.sh spring-4.3.x-scenario'
}
}

stage('dubbo 2.5.x-2.6.x (10)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} dubbo-2.5.x-scenario'
sh 'bash test/plugin/run.sh dubbo-2.5.x-scenario'
}
}

stage('spring 3.0.x (8)') {
stage('dubbo 2.7.x (4)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} spring-3.0.x-scenario'
sh 'bash test/plugin/run.sh dubbo-2.7.x-scenario'
}
}
}
}

stage('spring 3.1.x-4.0.x (25)') {
stage('Group2') {
stages {
stage('redisson 3.x (37)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} spring-3.1.x-scenario'
sh 'bash test/plugin/run.sh redisson-scenario'
}
}

stage('spring 4.1.x-4.2.x (20)') {
stage('spring 3.1.x-4.0.x (25)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} spring-4.1.x-scenario'
sh 'bash test/plugin/run.sh spring-3.1.x-scenario'
}
}

stage('apm-toolkit-trace (1)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} apm-toolkit-trace-scenario'
}
}
}
}
stage('Group2') {
stages {
stage('solrj 7.x (12)') {
stage('spring-cloud-gateway 2.1.x (3)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} solrj-7.x-scenario'
sh 'bash test/plugin/run.sh gateway-scenario'
}
}

stage('spring 4.3.x-5.2.x (54)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} spring-4.3.x-scenario'
}
}
stage('undertow-scenario 1.3.0-2.0.27 (23)') {
stage('elasticsearch 5.x (3)') {
steps {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} undertow-scenario'
sh 'bash test/plugin/run.sh elasticsearch-5.x-scenario'
}
}
}
Expand All @@ -150,7 +135,7 @@ pipeline {

post {
cleanup {
sh 'bash test/plugin/run.sh --build_id=wl2_${BUILD_ID} --cleanup'
sh 'bash test/plugin/run.sh --cleanup'
deleteDir()
}
}
Expand Down
Loading

0 comments on commit b17440c

Please sign in to comment.