Skip to content

Commit f7d20b1

Browse files
authored
Update for 2021 (#23)
Update for 2021
1 parent 1a9ded5 commit f7d20b1

File tree

12 files changed

+673
-56
lines changed

12 files changed

+673
-56
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
on: pull_request
2-
name: PR check
1+
on:
2+
push:
3+
branches:
4+
- master
5+
pull_request:
6+
branches:
7+
- master
8+
name: Continuous Integration
39
jobs:
410
build:
511
runs-on: ubuntu-latest
612
strategy:
713
matrix:
8-
java: [ 8, 11, 13 ]
14+
java: [ 11, 17 ]
915
name: Java ${{ matrix.java }}
1016
steps:
1117
- name: Check out code
1218
uses: actions/checkout@master
1319
- name: Setup java
14-
uses: actions/setup-java@master
20+
uses: actions/setup-java@v2
1521
with:
1622
java-version: ${{ matrix.java }}
17-
- run: mvn -U -B verify
23+
distribution: temurin
24+
- run: ./mvnw -U -B verify

.github/workflows/release.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@master
1515
- name: Setup Java
16-
uses: actions/setup-java@master
16+
uses: actions/setup-java@v2
1717
with:
18-
java-version: 1.8
18+
java-version: 11
19+
distribution: temurin
1920
- name: Set SSH key
20-
uses: webfactory/ssh-agent@v0.2.0
21+
uses: webfactory/ssh-agent@v0.5.4
2122
with:
2223
ssh-private-key: ${{ secrets.SSH_KEY }}
2324
- name: Add known host key
2425
run: ssh-keyscan javacard.pro >> ~/.ssh/known_hosts
2526
- name: Package
26-
run: mvn -B verify
27+
run: ./mvnw -B verify
2728
- name: Release
2829
id: create_release
2930
uses: actions/create-release@v1.0.0
@@ -35,4 +36,4 @@ jobs:
3536
draft: false
3637
prerelease: false
3738
- name: Deploy package
38-
run: mvn -B deploy
39+
run: ./mvnw -B deploy

.gitignore

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
# Compiled class file
2-
*.class
3-
4-
# Log file
5-
*.log
61

72
# BlueJ files
8-
*.ctxt
9-
3+
# Compiled class file
4+
# Log file
105
# Mobile Tools for Java (J2ME)
11-
.mtj.tmp/
12-
136
# Package Files #
7+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
8+
**/target
9+
*.class
10+
*.ctxt
11+
*.ear
12+
*.iml
1413
*.jar
14+
*.log
15+
*.rar
16+
*.tar.gz
1517
*.war
16-
*.ear
1718
*.zip
18-
*.tar.gz
19-
*.rar
20-
21-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
22-
hs_err_pid*
23-
19+
*~
20+
.mtj.tmp/
2421
/.idea
22+
/.mvn/wrapper/maven-wrapper.jar
23+
hs_err_pid*
24+
pom.xml.versionsBackup
+117
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*
2+
* Copyright 2007-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
import java.net.*;
17+
import java.io.*;
18+
import java.nio.channels.*;
19+
import java.util.Properties;
20+
21+
public class MavenWrapperDownloader {
22+
23+
private static final String WRAPPER_VERSION = "0.5.6";
24+
/**
25+
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
26+
*/
27+
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
28+
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
29+
30+
/**
31+
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
32+
* use instead of the default one.
33+
*/
34+
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
35+
".mvn/wrapper/maven-wrapper.properties";
36+
37+
/**
38+
* Path where the maven-wrapper.jar will be saved to.
39+
*/
40+
private static final String MAVEN_WRAPPER_JAR_PATH =
41+
".mvn/wrapper/maven-wrapper.jar";
42+
43+
/**
44+
* Name of the property which should be used to override the default download url for the wrapper.
45+
*/
46+
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
47+
48+
public static void main(String args[]) {
49+
System.out.println("- Downloader started");
50+
File baseDirectory = new File(args[0]);
51+
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
52+
53+
// If the maven-wrapper.properties exists, read it and check if it contains a custom
54+
// wrapperUrl parameter.
55+
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
56+
String url = DEFAULT_DOWNLOAD_URL;
57+
if(mavenWrapperPropertyFile.exists()) {
58+
FileInputStream mavenWrapperPropertyFileInputStream = null;
59+
try {
60+
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
61+
Properties mavenWrapperProperties = new Properties();
62+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
63+
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
64+
} catch (IOException e) {
65+
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
66+
} finally {
67+
try {
68+
if(mavenWrapperPropertyFileInputStream != null) {
69+
mavenWrapperPropertyFileInputStream.close();
70+
}
71+
} catch (IOException e) {
72+
// Ignore ...
73+
}
74+
}
75+
}
76+
System.out.println("- Downloading from: " + url);
77+
78+
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
79+
if(!outputFile.getParentFile().exists()) {
80+
if(!outputFile.getParentFile().mkdirs()) {
81+
System.out.println(
82+
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
83+
}
84+
}
85+
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
86+
try {
87+
downloadFileFromURL(url, outputFile);
88+
System.out.println("Done");
89+
System.exit(0);
90+
} catch (Throwable e) {
91+
System.out.println("- Error downloading");
92+
e.printStackTrace();
93+
System.exit(1);
94+
}
95+
}
96+
97+
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
98+
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
99+
String username = System.getenv("MVNW_USERNAME");
100+
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
101+
Authenticator.setDefault(new Authenticator() {
102+
@Override
103+
protected PasswordAuthentication getPasswordAuthentication() {
104+
return new PasswordAuthentication(username, password);
105+
}
106+
});
107+
}
108+
URL website = new URL(urlString);
109+
ReadableByteChannel rbc;
110+
rbc = Channels.newChannel(website.openStream());
111+
FileOutputStream fos = new FileOutputStream(destination);
112+
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
113+
fos.close();
114+
rbc.close();
115+
}
116+
117+
}

.mvn/wrapper/maven-wrapper.properties

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

0 commit comments

Comments
 (0)