Skip to content

Commit 9643dd5

Browse files
committed
build: dynamic alpn version
1 parent 5b1aafc commit 9643dd5

3 files changed

Lines changed: 26 additions & 16 deletions

File tree

coverage-report/pom.xml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
45

56
<parent>
67
<groupId>org.jooby</groupId>
@@ -14,7 +15,7 @@
1415
<name>coverage report</name>
1516

1617
<properties>
17-
<alpn-boot.version>8.1.9.v20160720</alpn-boot.version>
18+
<alpn-boot-version>8.1.9.v20160720</alpn-boot-version>
1819
</properties>
1920

2021
<profiles>
@@ -162,7 +163,8 @@
162163
<directory>${project.parent.basedir}/jooby/src/test/resources</directory>
163164
</resource>
164165
<resource>
165-
<directory>${project.parent.basedir}/jooby-assets/src/test/resources</directory>
166+
<directory>${project.parent.basedir}/jooby-assets/src/test/resources
167+
</directory>
166168
</resource>
167169
<resource>
168170
<directory>${project.parent.basedir}/jooby-hbs/src/test/resources</directory>
@@ -171,7 +173,8 @@
171173
<directory>${project.parent.basedir}/jooby-hbm/src/test/resources</directory>
172174
</resource>
173175
<resource>
174-
<directory>${project.parent.basedir}/jooby-whoops/src/test/resources</directory>
176+
<directory>${project.parent.basedir}/jooby-whoops/src/test/resources
177+
</directory>
175178
</resource>
176179
</resources>
177180
</configuration>
@@ -225,13 +228,23 @@
225228
<include>**/*Issue*.java</include>
226229
</includes>
227230
<argLine>-Xmx1024m -XX:MaxPermSize=256m
228-
-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn-boot.version}/alpn-boot-${alpn-boot.version}.jar</argLine>
231+
-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn-boot-version}/alpn-boot-${alpn-boot-version}.jar
232+
</argLine>
229233
<systemPropertyVariables>
230234
<!-- JaCoCo runtime must know where to dump coverage: -->
231235
<jacoco-agent.destfile>target${file.separator}jacoco.exec</jacoco-agent.destfile>
232-
<logback.configurationFile>src${file.separator}test${file.separator}resources${file.separator}logback-travis.xml</logback.configurationFile>
236+
<logback.configurationFile>
237+
src${file.separator}test${file.separator}resources${file.separator}logback-travis.xml
238+
</logback.configurationFile>
233239
</systemPropertyVariables>
234240
</configuration>
241+
<dependencies>
242+
<dependency>
243+
<groupId>org.mortbay.jetty.alpn</groupId>
244+
<artifactId>alpn-boot</artifactId>
245+
<version>${alpn-boot-version}</version>
246+
</dependency>
247+
</dependencies>
235248
</plugin>
236249

237250
</plugins>
@@ -756,13 +769,6 @@
756769
<version>${jetty.version}</version>
757770
</dependency>
758771

759-
<dependency>
760-
<groupId>org.mortbay.jetty.alpn</groupId>
761-
<artifactId>alpn-boot</artifactId>
762-
<version>${alpn-boot.version}</version>
763-
<scope>test</scope>
764-
</dependency>
765-
766772
</dependencies>
767773

768774
</project>

coverage.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
#!/bin/bash
2-
mvn -Dlogback.configurationFile=logback-travis.xml -DdryRun=true clean package coveralls:report -P coverage
2+
ALPN_VERSION="`groovy -e 'String v = (System.getProperty("java.vendor").contains("IBM") ? {def m = (["java", "-version"].execute().err.text =~ /(?s)java version "([0-9]*.[0-9]*.[0-9]*)".*Oracle jdk[0-9]u([0-9]*)-.*/); "${m[0][1]}_${m[0][2]}"}.call() : System.getProperty("java.version")); ((new URL("http://www.eclipse.org/jetty/documentation/9.4.x/alpn-chapter.html")).text =~ /ALPN vs. OpenJDK versions(.*)<\/table>/).each { m, s -> ( s =~ /([0-9].[0-9].[0-9]*u[0-9]*)[^0-9]*([0-9].[0-9]*.[0-9]*.v2[0-9]*)/).each { _, jdkv, alpnv -> if (v.equals(jdkv.replace("u","_"))){ println alpnv }}}'`"
3+
echo "ALPN $ALPN_VERSION"
4+
mvn -Dlogback.configurationFile=logback-travis.xml -Dalpn-boot-version=$ALPN_VERSION -DdryRun=true clean package coveralls:report -P coverage

travis.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
#!/bin/bash
2-
mvn -Dlogback.configurationFile=logback-travis.xml -DdryRun=true -Dcoverage.port=random -Dcoverage.securePort=random clean package coveralls:report -P coverage
2+
ALPN_VERSION="`groovy -e 'String v = (System.getProperty("java.vendor").contains("IBM") ? {def m = (["java", "-version"].execute().err.text =~ /(?s)java version "([0-9]*.[0-9]*.[0-9]*)".*Oracle jdk[0-9]u([0-9]*)-.*/); "${m[0][1]}_${m[0][2]}"}.call() : System.getProperty("java.version")); ((new URL("http://www.eclipse.org/jetty/documentation/9.4.x/alpn-chapter.html")).text =~ /ALPN vs. OpenJDK versions(.*)<\/table>/).each { m, s -> ( s =~ /([0-9].[0-9].[0-9]*u[0-9]*)[^0-9]*([0-9].[0-9]*.[0-9]*.v2[0-9]*)/).each { _, jdkv, alpnv -> if (v.equals(jdkv.replace("u","_"))){ println alpnv }}}'`"
3+
echo "ALPN $ALPN_VERSION"
4+
mvn -Dlogback.configurationFile=logback-travis.xml -Dalpn-boot-version=$ALPN_VERSION -DdryRun=true -Dcoverage.port=random -Dcoverage.securePort=random clean package coveralls:report -P coverage

0 commit comments

Comments
 (0)