Skip to content

Commit 3fbd413

Browse files
author
Guilherme Biff Zarelli
authored
Merge pull request #9 from helpdeveloper/gz-upgrade-versions
Upgrade to java 17
2 parents a145034 + a9c9c94 commit 3fbd413

File tree

19 files changed

+792
-80
lines changed

19 files changed

+792
-80
lines changed

‎.docker-compose/stack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.8'
1+
version: '3.3'
22

33
volumes:
44
prometheus_data: {}
@@ -17,7 +17,7 @@ services:
1717
- 3306:3306
1818

1919
flyway:
20-
image: flyway/flyway
20+
image: flyway/flyway:7.5.2
2121
command: -url=jdbc:mysql://sampledb -schemas=sample -user=root -password=pass123 -connectRetries=60 migrate
2222
volumes:
2323
- ../resources/flyway/db/migration:/flyway/sql

‎.github/workflows/maven.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: Set up JDK 11
17+
- name: Set up JDK 17
1818
uses: actions/setup-java@v1
1919
with:
20-
java-version: 11
20+
java-version: 17
2121
- name: Build with Maven
22-
run: mvn -B verify coveralls:report -DrepoToken=${{ secrets.COVERALLS_REPO_TOKEN }} --file pom.xml
22+
run: ./mvnw -B verify coveralls:report -DrepoToken=${{ secrets.COVERALLS_REPO_TOKEN }} --file pom.xml

‎.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import java.net.*;
21+
import java.io.*;
22+
import java.nio.channels.*;
23+
import java.util.Properties;
24+
25+
public class MavenWrapperDownloader
26+
{
27+
private static final String WRAPPER_VERSION = "3.1.0";
28+
29+
/**
30+
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
31+
*/
32+
private static final String DEFAULT_DOWNLOAD_URL =
33+
"https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/" + WRAPPER_VERSION
34+
+ "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
35+
36+
/**
37+
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to use instead of the
38+
* default one.
39+
*/
40+
private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties";
41+
42+
/**
43+
* Path where the maven-wrapper.jar will be saved to.
44+
*/
45+
private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar";
46+
47+
/**
48+
* Name of the property which should be used to override the default download url for the wrapper.
49+
*/
50+
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
51+
52+
public static void main( String args[] )
53+
{
54+
System.out.println( "- Downloader started" );
55+
File baseDirectory = new File( args[0] );
56+
System.out.println( "- Using base directory: " + baseDirectory.getAbsolutePath() );
57+
58+
// If the maven-wrapper.properties exists, read it and check if it contains a custom
59+
// wrapperUrl parameter.
60+
File mavenWrapperPropertyFile = new File( baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH );
61+
String url = DEFAULT_DOWNLOAD_URL;
62+
if ( mavenWrapperPropertyFile.exists() )
63+
{
64+
FileInputStream mavenWrapperPropertyFileInputStream = null;
65+
try
66+
{
67+
mavenWrapperPropertyFileInputStream = new FileInputStream( mavenWrapperPropertyFile );
68+
Properties mavenWrapperProperties = new Properties();
69+
mavenWrapperProperties.load( mavenWrapperPropertyFileInputStream );
70+
url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, url );
71+
}
72+
catch ( IOException e )
73+
{
74+
System.out.println( "- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" );
75+
}
76+
finally
77+
{
78+
try
79+
{
80+
if ( mavenWrapperPropertyFileInputStream != null )
81+
{
82+
mavenWrapperPropertyFileInputStream.close();
83+
}
84+
}
85+
catch ( IOException e )
86+
{
87+
// Ignore ...
88+
}
89+
}
90+
}
91+
System.out.println( "- Downloading from: " + url );
92+
93+
File outputFile = new File( baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH );
94+
if ( !outputFile.getParentFile().exists() )
95+
{
96+
if ( !outputFile.getParentFile().mkdirs() )
97+
{
98+
System.out.println( "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath()
99+
+ "'" );
100+
}
101+
}
102+
System.out.println( "- Downloading to: " + outputFile.getAbsolutePath() );
103+
try
104+
{
105+
downloadFileFromURL( url, outputFile );
106+
System.out.println( "Done" );
107+
System.exit( 0 );
108+
}
109+
catch ( Throwable e )
110+
{
111+
System.out.println( "- Error downloading" );
112+
e.printStackTrace();
113+
System.exit( 1 );
114+
}
115+
}
116+
117+
private static void downloadFileFromURL( String urlString, File destination )
118+
throws Exception
119+
{
120+
if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null )
121+
{
122+
String username = System.getenv( "MVNW_USERNAME" );
123+
char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray();
124+
Authenticator.setDefault( new Authenticator()
125+
{
126+
@Override
127+
protected PasswordAuthentication getPasswordAuthentication()
128+
{
129+
return new PasswordAuthentication( username, password );
130+
}
131+
} );
132+
}
133+
URL website = new URL( urlString );
134+
ReadableByteChannel rbc;
135+
rbc = Channels.newChannel( website.openStream() );
136+
FileOutputStream fos = new FileOutputStream( destination );
137+
fos.getChannel().transferFrom( rbc, 0, Long.MAX_VALUE );
138+
fos.close();
139+
rbc.close();
140+
}
141+
142+
}

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

‎Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
###
2828
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
2929

30-
ARG JAVA_PACKAGE=java-11-openjdk-headless
30+
ARG JAVA_PACKAGE=java-17-openjdk-headless
3131
ARG RUN_JAVA_VERSION=1.3.8
3232
ENV FLYWAY_VERSION 7.5.2
3333
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
@@ -56,9 +56,8 @@ RUN curl https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${FLYWAY
5656

5757
# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
5858
ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
59-
60-
COPY app/quarkus-app/target/lib/* /deployments/lib/
61-
COPY app/quarkus-app/target/*-runner.jar /deployments/app.jar
59+
ENV JAVA_APP_JAR="quarkus-run.jar"
60+
COPY app/quarkus-app/target/quarkus-app/ /deployments/
6261
COPY resources/flyway/db/migration /flyway/sql
6362

6463
EXPOSE 8080

‎acceptance-test/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@
1212
<artifactId>acceptance-test</artifactId>
1313

1414
<properties>
15-
<maven.compiler.source>11</maven.compiler.source>
16-
<maven.compiler.target>11</maven.compiler.target>
15+
<maven.compiler.source>17</maven.compiler.source>
16+
<maven.compiler.target>17</maven.compiler.target>
1717
<mutation.skip>true</mutation.skip>
1818
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
1919
<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
2020
<mysql-connector-java.version>8.0.25</mysql-connector-java.version>
21-
<docker-maven-plugin.version>0.35.0</docker-maven-plugin.version>
22-
<run-java-sh.version>1.2.2</run-java-sh.version>
21+
<docker-maven-plugin.version>0.38.1</docker-maven-plugin.version>
2322
<mutation.skip>true</mutation.skip>
24-
<wiremock-jre8.version>2.27.2</wiremock-jre8.version>
23+
<wiremock-jre8.version>2.33.2</wiremock-jre8.version>
2524
</properties>
2625

2726
<dependencies>

‎acceptance-test/src/test/java/br/com/helpdev/atdd/DefaultContainerStarterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private static GenericContainer<?> buildMySqlContainer() {
4848
}
4949

5050
private static GenericContainer<?> buildFlywayContainer(final Startable... dependsOn) {
51-
return new GenericContainer<>("flyway/flyway")
51+
return new GenericContainer<>("flyway/flyway:7.5.2")
5252
.dependsOn(dependsOn)
5353
.withNetwork(NETWORK)
5454
.withCopyFileToContainer(MountableFile.forHostPath("../resources/flyway/db"), "/flyway/sql")
@@ -66,7 +66,7 @@ private static GenericContainer<?> buildAppContainer(final Startable... dependsO
6666
.withEnv("MYSQL_PASSWORD", "test")
6767
.withEnv("MYSQL_URL", "jdbc:mysql://testdb:" + MySQLContainer.MYSQL_PORT + "/test?autoReconnect=true&useSSL=false")
6868
.withExposedPorts(8080)
69-
.waitingFor(Wait.forHttp("/health/ready").forStatusCode(200))
69+
.waitingFor(Wait.forHttp("/q/health/ready").forStatusCode(200))
7070
.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("APP_CONTAINER")));
7171
}
7272

‎adapter/input/jaxrs-controller-v1/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<artifactId>jaxrs-controller-v1</artifactId>
1414

1515
<properties>
16-
<maven.compiler.source>11</maven.compiler.source>
17-
<maven.compiler.target>11</maven.compiler.target>
16+
<maven.compiler.source>17</maven.compiler.source>
17+
<maven.compiler.target>17</maven.compiler.target>
1818
<swagger-core.version>2.1.6</swagger-core.version>
1919
<swagger-maven-plugin.version>2.1.5</swagger-maven-plugin.version>
2020
</properties>

‎adapter/output/jpa-mysql-repository/pom.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<artifactId>jpa-mysql-repository</artifactId>
1414

1515
<properties>
16-
<maven.compiler.source>11</maven.compiler.source>
17-
<maven.compiler.target>11</maven.compiler.target>
16+
<maven.compiler.source>17</maven.compiler.source>
17+
<maven.compiler.target>17</maven.compiler.target>
1818
</properties>
1919

2020
<dependencies>
@@ -25,8 +25,10 @@
2525
<dependency>
2626
<groupId>jakarta.persistence</groupId>
2727
<artifactId>jakarta.persistence-api</artifactId>
28-
<version>${jakarta.persistence-api.version}</version>
29-
<scope>provided</scope>
28+
</dependency>
29+
<dependency>
30+
<groupId>jakarta.transaction</groupId>
31+
<artifactId>jakarta.transaction-api</artifactId>
3032
</dependency>
3133
<dependency>
3234
<groupId>${project.groupId}</groupId>

‎adapter/output/restclient-http-services/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<artifactId>restclient-http-services</artifactId>
1414

1515
<properties>
16-
<maven.compiler.source>11</maven.compiler.source>
17-
<maven.compiler.target>11</maven.compiler.target>
16+
<maven.compiler.source>17</maven.compiler.source>
17+
<maven.compiler.target>17</maven.compiler.target>
1818
<coverage.exclude.code>**/*Dto.*</coverage.exclude.code>
1919
<mutation.excluded.code>**.dto.*</mutation.excluded.code>
2020
</properties>

0 commit comments

Comments
 (0)