Skip to content

Commit 5b6542b

Browse files
author
Dennis Labordus
committed
Merge branch 'develop' into support-multi-versions-scl
Signed-off-by: Dennis Labordus <[email protected]>
2 parents 656ace4 + b922b1f commit 5b6542b

34 files changed

+1338
-600
lines changed

.github/workflows/gradle_build.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/maven_build.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# SPDX-FileCopyrightText: 2021 Alliander N.V.
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
name: Maven Build
6+
7+
on: push
8+
9+
jobs:
10+
build:
11+
name: Build
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 15
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up JDK 1.11
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: 1.11
21+
- name: Create custom Maven Settings.xml
22+
uses: whelk-io/maven-settings-xml-action@v18
23+
with:
24+
output_file: custom_maven_settings.xml
25+
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
26+
- name: Build with Maven
27+
run: ./mvnw -s custom_maven_settings.xml -B clean verify

.github/workflows/sonarcloud_analysis.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,25 @@ jobs:
2626
path: ~/.sonar/cache
2727
key: ${{ runner.os }}-sonar
2828
restore-keys: ${{ runner.os }}-sonar
29-
- name: Cache Gradle packages
29+
- name: Cache Maven packages
3030
uses: actions/cache@v1
3131
with:
32-
path: ~/.gradle/caches
33-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
34-
restore-keys: ${{ runner.os }}-gradle
32+
path: ~/.m2
33+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
34+
restore-keys: ${{ runner.os }}-m2
35+
- name: Create custom Maven Settings.xml
36+
uses: whelk-io/maven-settings-xml-action@v18
37+
with:
38+
output_file: custom_maven_settings.xml
39+
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
3540
- name: Build and analyze
3641
env:
3742
GITHUB_USERNAME: "OWNER"
38-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3944
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
40-
run: ./gradlew build jacocoTestReport sonarqube -Dsonar.projectKey=com-pas_compas-scl-data-service -Dsonar.organization=com-pas -Dsonar.host.url=https://sonarcloud.io --info
45+
run: |
46+
./mvnw -s custom_maven_settings.xml -B -Psonar \
47+
-Dsonar.projectKey=com-pas_compas-scl-data-service \
48+
-Dsonar.organization=com-pas \
49+
-Dsonar.host.url=https://sonarcloud.io \
50+
clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
Lines changed: 117 additions & 0 deletions
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+
* https://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+
}
Lines changed: 2 additions & 0 deletions
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.1/apache-maven-3.8.1-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.reuse/dep5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Files: app/src/main/docker/*
77
Copyright: 2021 Alliander N.V.
88
License: Apache-2.0
99

10-
Files: gradle/wrapper/*
10+
Files: .mvn/wrapper/*
1111
Copyright: 2021 Alliander N.V.
1212
License: Apache-2.0

README.md

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,46 @@ Check [basexhttp on DockerHub](https://hub.docker.com/r/basex/basexhttp/) for a
2525

2626
You can run your application in dev mode that enables live coding using:
2727

28+
```shell script
29+
./mvnw package io.quarkus:quarkus-maven-plugin:2.0.0.Final:dev
2830
```
29-
./gradlew quarkusDev
30-
```
31+
32+
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8080/q/dev/.
3133
3234
## Packaging and running the application
3335

34-
The application can be packaged using `./gradlew quarkusBuild`. It produces
35-
the `compas-scl-data-service-1.0-SNAPSHOT-runner.jar` file in the `build` directory. Be aware that it’s not an _
36-
über-jar_ as the dependencies are copied into the `build/lib` directory.
36+
The application can be packaged using:
3737

38-
The application is now runnable using `java -jar build/compas-cim-mapping-1.0-SNAPSHOT-runner.jar`.
38+
```shell script
39+
./mvnw package
40+
```
3941

40-
If you want to build an _über-jar_, just add the `--uber-jar` option to the command line:
42+
It produces the `quarkus-run.jar` file in the `app/target/quarkus-app/` directory. Be aware that it’s not an _über-jar_ as
43+
the dependencies are copied into the `app/target/quarkus-app/lib/` directory.
4144

42-
```
43-
./gradlew quarkusBuild --uber-jar
45+
If you want to build an _über-jar_, execute the following command:
46+
47+
```shell script
48+
./mvnw package -Dquarkus.package.type=uber-jar
4449
```
4550

51+
The application is now runnable using `java -jar app/target/quarkus-app/quarkus-run.jar`.
52+
4653
## Creating a native executable
4754

48-
You can create a native executable using: `./gradlew build -Dquarkus.package.type=native`.
55+
You can create a native executable using:
56+
57+
```shell script
58+
./mvnw package -Pnative
59+
```
4960

50-
Or, if you don't have GraalVM installed, you can run the native executable build in a container
51-
using: `./gradlew build -Dquarkus.package.type=native -Dquarkus.native.container-build=true`.
61+
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
62+
63+
```shell script
64+
./mvnw package -Pnative -Dquarkus.native.container-build=true
65+
```
5266

53-
You can then execute your native executable with: `./build/compas-scl-data-service-1.0-SNAPSHOT-runner`
67+
You can then execute your native executable with: `./app/target/code-with-quarkus-1.0.0-SNAPSHOT-runner`
5468

55-
If you want to learn more about building native executables, please
56-
consult https://quarkus.io/guides/gradle-tooling#building-a-native-executable.
69+
If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.html
70+
.

app/build.gradle

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)