Skip to content

Commit 26aa5a3

Browse files
FredTregFredTreg
committed
Moving from CRLF to LF
1 parent c2398d3 commit 26aa5a3

File tree

12 files changed

+414
-414
lines changed

12 files changed

+414
-414
lines changed

‎docker/build.sh

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
#!/bin/bash
2-
3-
# Exit as soon as a command return status != 0
4-
set -e
5-
6-
SRC_DIR=/project/target
7-
TARGET_DIR=/project/target/jars
8-
9-
# Create target dir
10-
mkdir -p ${TARGET_DIR}
11-
12-
cd ${SRC_DIR}
13-
14-
# Build the project: create all the jar files
15-
mvn clean install jar:test-jar -DskipTests
16-
# Copy the jar files into the target directory
17-
find ${SRC_DIR} -name "*.jar" -not -path "${TARGET_DIR}/*" -exec cp {} ${TARGET_DIR} \;
18-
# Copy all the dependencies into the target directory
19-
mvn dependency:copy-dependencies -DoutputDirectory=${TARGET_DIR}
20-
21-
# Clean all except jars
22-
shopt -s extglob
23-
rm -rf !("jars")
24-
25-
# Clean .m2 directory
1+
#!/bin/bash
2+
3+
# Exit as soon as a command return status != 0
4+
set -e
5+
6+
SRC_DIR=/project/target
7+
TARGET_DIR=/project/target/jars
8+
9+
# Create target dir
10+
mkdir -p ${TARGET_DIR}
11+
12+
cd ${SRC_DIR}
13+
14+
# Build the project: create all the jar files
15+
mvn clean install jar:test-jar -DskipTests
16+
# Copy the jar files into the target directory
17+
find ${SRC_DIR} -name "*.jar" -not -path "${TARGET_DIR}/*" -exec cp {} ${TARGET_DIR} \;
18+
# Copy all the dependencies into the target directory
19+
mvn dependency:copy-dependencies -DoutputDirectory=${TARGET_DIR}
20+
21+
# Clean all except jars
22+
shopt -s extglob
23+
rm -rf !("jars")
24+
25+
# Clean .m2 directory
2626
rm -rf ${HOME}/.m2

‎docker/kotlin-compiler-junit-runner.sh

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
#!/bin/bash
2-
# Can be invoked as:
3-
# xxx.sh SOURCE_DIR TestClass
4-
# xxx.sh SOURCE_DIR TestClass#testMethod
5-
# xxx.sh TestClass
6-
# xxx.sh TestClass#testMethod
7-
8-
compilationExitCode=0
9-
executionExitCode=0
10-
11-
JARS_DIR="/project/target/jars"
12-
WORKSPACE_DIR="/project/workspace"
13-
14-
cd /project/target
15-
16-
classpath=$(echo ${JARS_DIR}/*.jar | tr ' ' ':')
17-
18-
SOURCE_DIR=$(pwd)
19-
20-
if [ "$#" == "2" ]; then
21-
SOURCE_DIR=$(pwd)/$1
22-
shift
23-
fi
24-
25-
cd ${SOURCE_DIR} || echo "Could not find directory ${SOURCE_DIR}" && exit 1
26-
27-
find * -name "*.kt" -print0 | xargs -0 /opt/techio/k2/K2JVMCompiler org.jetbrains.kotlin.cli.jvm.K2JVMCompiler -no-stdlib -cp "$classpath" -d "${WORKSPACE_DIR}"
28-
compilationExitCode=$?
29-
30-
if [ $compilationExitCode -eq 0 ]; then
31-
java -cp "${WORKSPACE_DIR}:$classpath:/opt/techio/junit-runner/junit-runner.jar" io.tech.runner.junit.JUnitTestListRunner $1
32-
else
33-
exit $compilationExitCode
34-
fi
1+
#!/bin/bash
2+
# Can be invoked as:
3+
# xxx.sh SOURCE_DIR TestClass
4+
# xxx.sh SOURCE_DIR TestClass#testMethod
5+
# xxx.sh TestClass
6+
# xxx.sh TestClass#testMethod
7+
8+
compilationExitCode=0
9+
executionExitCode=0
10+
11+
JARS_DIR="/project/target/jars"
12+
WORKSPACE_DIR="/project/workspace"
13+
14+
cd /project/target
15+
16+
classpath=$(echo ${JARS_DIR}/*.jar | tr ' ' ':')
17+
18+
SOURCE_DIR=$(pwd)
19+
20+
if [ "$#" == "2" ]; then
21+
SOURCE_DIR=$(pwd)/$1
22+
shift
23+
fi
24+
25+
cd ${SOURCE_DIR} || echo "Could not find directory ${SOURCE_DIR}" && exit 1
26+
27+
find * -name "*.kt" -print0 | xargs -0 /opt/techio/k2/K2JVMCompiler org.jetbrains.kotlin.cli.jvm.K2JVMCompiler -no-stdlib -cp "$classpath" -d "${WORKSPACE_DIR}"
28+
compilationExitCode=$?
29+
30+
if [ $compilationExitCode -eq 0 ]; then
31+
java -cp "${WORKSPACE_DIR}:$classpath:/opt/techio/junit-runner/junit-runner.jar" io.tech.runner.junit.JUnitTestListRunner $1
32+
else
33+
exit $compilationExitCode
34+
fi

‎docker/settings.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<settings>
2-
<mirrors>
3-
<mirror>
4-
<!--This sends everything else to /public -->
5-
<id>nexus</id>
6-
<mirrorOf>central</mirrorOf>
7-
<url>https://nexus.codingame.com/repository/maven-central/</url>
8-
</mirror>
9-
</mirrors>
1+
<settings>
2+
<mirrors>
3+
<mirror>
4+
<!--This sends everything else to /public -->
5+
<id>nexus</id>
6+
<mirrorOf>central</mirrorOf>
7+
<url>https://nexus.codingame.com/repository/maven-central/</url>
8+
</mirror>
9+
</mirrors>
1010
</settings>

‎maven3-junit4-runner/pom.xml

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
1-
<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/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>io.tech.runner</groupId>
4-
<artifactId>maven3-junit4-runner</artifactId>
5-
<version>0.0.1-SNAPSHOT</version>
6-
7-
<properties>
8-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9-
</properties>
10-
11-
<dependencies>
12-
<dependency>
13-
<groupId>junit</groupId>
14-
<artifactId>junit</artifactId>
15-
<version>4.12</version>
16-
<scope>provided</scope>
17-
</dependency>
18-
<dependency>
19-
<groupId>org.apache.commons</groupId>
20-
<artifactId>commons-io</artifactId>
21-
<version>1.3.2</version>
22-
</dependency>
23-
<dependency>
24-
<groupId>org.assertj</groupId>
25-
<artifactId>assertj-core</artifactId>
26-
<version>3.6.1</version>
27-
<scope>test</scope>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.mockito</groupId>
31-
<artifactId>mockito-core</artifactId>
32-
<version>2.6.8</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>io.vertx</groupId>
36-
<artifactId>vertx-core</artifactId>
37-
<version>3.0.0</version>
38-
<scope>test</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>io.vertx</groupId>
42-
<artifactId>vertx-unit</artifactId>
43-
<version>3.0.0</version>
44-
<scope>test</scope>
45-
</dependency>
46-
</dependencies>
47-
48-
<build>
49-
<plugins>
50-
<plugin>
51-
<groupId>org.apache.maven.plugins</groupId>
52-
<artifactId>maven-compiler-plugin</artifactId>
53-
<version>3.5.1</version>
54-
<configuration>
55-
<source>1.8</source>
56-
<target>1.8</target>
57-
</configuration>
58-
</plugin>
59-
<plugin>
60-
<artifactId>maven-assembly-plugin</artifactId>
61-
<configuration>
62-
<archive>
63-
<manifest>
64-
<mainClass>io.tech.runner.junit.JUnitTestListRunner</mainClass>
65-
</manifest>
66-
</archive>
67-
<descriptorRefs>
68-
<descriptorRef>jar-with-dependencies</descriptorRef>
69-
</descriptorRefs>
70-
</configuration>
71-
<executions>
72-
<execution>
73-
<id>make-assembly</id>
74-
<phase>package</phase>
75-
<goals>
76-
<goal>single</goal>
77-
</goals>
78-
</execution>
79-
</executions>
80-
</plugin>
81-
</plugins>
82-
</build>
83-
</project>
1+
<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/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>io.tech.runner</groupId>
4+
<artifactId>maven3-junit4-runner</artifactId>
5+
<version>0.0.1-SNAPSHOT</version>
6+
7+
<properties>
8+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9+
</properties>
10+
11+
<dependencies>
12+
<dependency>
13+
<groupId>junit</groupId>
14+
<artifactId>junit</artifactId>
15+
<version>4.12</version>
16+
<scope>provided</scope>
17+
</dependency>
18+
<dependency>
19+
<groupId>org.apache.commons</groupId>
20+
<artifactId>commons-io</artifactId>
21+
<version>1.3.2</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.assertj</groupId>
25+
<artifactId>assertj-core</artifactId>
26+
<version>3.6.1</version>
27+
<scope>test</scope>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.mockito</groupId>
31+
<artifactId>mockito-core</artifactId>
32+
<version>2.6.8</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>io.vertx</groupId>
36+
<artifactId>vertx-core</artifactId>
37+
<version>3.0.0</version>
38+
<scope>test</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>io.vertx</groupId>
42+
<artifactId>vertx-unit</artifactId>
43+
<version>3.0.0</version>
44+
<scope>test</scope>
45+
</dependency>
46+
</dependencies>
47+
48+
<build>
49+
<plugins>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-compiler-plugin</artifactId>
53+
<version>3.5.1</version>
54+
<configuration>
55+
<source>1.8</source>
56+
<target>1.8</target>
57+
</configuration>
58+
</plugin>
59+
<plugin>
60+
<artifactId>maven-assembly-plugin</artifactId>
61+
<configuration>
62+
<archive>
63+
<manifest>
64+
<mainClass>io.tech.runner.junit.JUnitTestListRunner</mainClass>
65+
</manifest>
66+
</archive>
67+
<descriptorRefs>
68+
<descriptorRef>jar-with-dependencies</descriptorRef>
69+
</descriptorRefs>
70+
</configuration>
71+
<executions>
72+
<execution>
73+
<id>make-assembly</id>
74+
<phase>package</phase>
75+
<goals>
76+
<goal>single</goal>
77+
</goals>
78+
</execution>
79+
</executions>
80+
</plugin>
81+
</plugins>
82+
</build>
83+
</project>

0 commit comments

Comments
 (0)