Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 'release-0.4.0' into 'master' #23

Merged
merged 51 commits into from
Jan 6, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
b02f9e0
Merge pull request #8 from nordic-institute/release-0.3.0
haapakanni Sep 5, 2018
a7dfd36
XRDDEV-89 update snapshot version number
Sep 5, 2018
7e533a1
Merge pull request #9 from nordic-institute/XRDDEV-89
haapakanni Sep 6, 2018
808aea9
Update XRd4J version from 0.3.0-SNAPSHOT to 0.3.0
petkivim Nov 27, 2018
1b30995
Update OWASP dependency check plugin version to 4.0.2
petkivim May 5, 2019
f26a6b8
Merge branch 'develop' of github.com:nordic-institute/xrd4j into develop
petkivim May 5, 2019
228e4f1
Update OWASP dependency check to 5.2.1
jhyoty Aug 9, 2019
2f54eab
XRDDEV-614. Add XML format to dependency check report
jhyoty Aug 15, 2019
2070412
Add links to X-Road Community Slack
petkivim Aug 16, 2019
64c8eb9
Update Readme
petkivim Aug 24, 2019
76aa38d
Update OWASP dependency check plugin version
petkivim Apr 25, 2020
dd92100
XRDDEV-1349 Update dependency versions
petkivim Sep 14, 2020
ec2edee
XRDDEV-1349 Update changelog
petkivim Sep 15, 2020
8070bed
XRDDEV-1349 Update Log4J version
petkivim Sep 15, 2020
b28706c
Bump junit from 3.8.1 to 4.13.1 in /example-adapter
dependabot[bot] Oct 12, 2020
f3755d4
Bump junit from 3.8.1 to 4.13.1 in /src
dependabot[bot] Oct 12, 2020
ef56dac
Bump httpclient from 4.5.2 to 4.5.13 in /src/rest
dependabot[bot] Jun 3, 2021
739d0de
added listPeople and personDetails requests as more complex examples
raits Sep 9, 2021
89370ae
fix linter changed ul-style
raits Sep 9, 2021
ba8ba2f
Add 3rd party notices file
petkivim Sep 11, 2021
1732b34
Include license and copyright info in jar files
petkivim Sep 11, 2021
87c2783
Merge pull request #13 from nordic-institute/dependabot/maven/src/res…
petkivim Sep 11, 2021
ff19296
Merge branch 'develop' into XRDDEV-1349
petkivim Sep 11, 2021
ae64a53
Merge pull request #10 from nordic-institute/XRDDEV-1349
petkivim Sep 11, 2021
5f2e0cb
Update changelog
petkivim Sep 11, 2021
4e7d5c7
Merge pull request #12 from nordic-institute/dependabot/maven/src/jun…
petkivim Sep 11, 2021
c953350
Move 3rd party notices to project root
petkivim Sep 11, 2021
78a30e2
Update resource plugin configuration
petkivim Sep 11, 2021
d660aec
Update 3rd party notices
petkivim Sep 11, 2021
eacbab1
update based on review comments
raits Sep 13, 2021
471a2fd
Merge pull request #14 from nordic-institute/misp2-example-services
petkivim Sep 14, 2021
4b51138
Merge pull request #11 from nordic-institute/dependabot/maven/example…
petkivim Sep 14, 2021
e45e5c1
Add 3rd party notices for Example Adapter
petkivim Sep 15, 2021
93f885b
Update Example Adapter packaging
petkivim Sep 16, 2021
121bbad
Bump log4j-core from 2.13.3 to 2.15.0 in /src
dependabot[bot] Dec 10, 2021
d8237be
Update log4j version to 2.15.0
petkivim Dec 10, 2021
20ac76d
Merge pull request #15 from nordic-institute/dependabot/maven/src/org…
petkivim Dec 10, 2021
6310772
Update log4j version to 2.15.0
petkivim Dec 10, 2021
3dd3052
Bump log4j-core from 2.15.0 to 2.17.0 in /src
dependabot[bot] Dec 18, 2021
c07f419
Bump log4j-core from 2.15.0 to 2.17.0 in /example-adapter
dependabot[bot] Dec 18, 2021
686087c
Merge pull request #18 from nordic-institute/dependabot/maven/src/org…
petkivim Dec 19, 2021
0669b89
Merge pull request #19 from nordic-institute/dependabot/maven/example…
petkivim Dec 19, 2021
0032235
XRDDEV-1874 Adding support for JRE 11
carohauta Dec 23, 2021
f1c0edf
XRDDEV-1874 Adding support for JRE 11 pr comment fixes
carohauta Jan 3, 2022
eaa43bf
XRDDEV-1874: Minor fixes
jhyoty Jan 4, 2022
5851e71
Merge pull request #20 from nordic-institute/XRDDEV-1874-jre-11-support
jhyoty Jan 4, 2022
e70d089
Bump log4j-core from 2.17.0 to 2.17.1 in /src
dependabot[bot] Jan 4, 2022
dca5d78
Bump log4j-core from 2.17.0 to 2.17.1 in /example-adapter
dependabot[bot] Jan 4, 2022
1d1d62b
Merge pull request #21 from nordic-institute/dependabot/maven/src/org…
petkivim Jan 5, 2022
f2a137e
Merge pull request #22 from nordic-institute/dependabot/maven/example…
petkivim Jan 5, 2022
c5c49ab
XRDDEV-1874 Prepare artifact versions
carohauta Jan 5, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
XRDDEV-1874 Adding support for JRE 11
* add dependency to Java SOAP library (that is no longer a part of the Java 11 distribution)
* example project depends on the snapshot version of XRd4J
* example Dockerfile based on JRE 11
  • Loading branch information
carohauta committed Dec 23, 2021
commit 0032235384513eba5e6f7b759d8cec62e2129197
6 changes: 3 additions & 3 deletions example-adapter/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base java:8
FROM java:8
# Base java:11
FROM adoptopenjdk/openjdk11:jre-11.0.11_9

# Add Rest Gateway jar to container
ADD target/example-adapter-*.jar example-adapter.jar
Expand All @@ -8,4 +8,4 @@ ADD target/example-adapter-*.jar example-adapter.jar
ENTRYPOINT ["java", "-jar", "/example-adapter.jar"]

# Expose Tomcat
EXPOSE 8080
EXPOSE 8080
2 changes: 1 addition & 1 deletion example-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<xrd4j.version>0.3.0</xrd4j.version>
<xrd4j.version>0.4.0-SNAPSHOT</xrd4j.version>
<wsdl.path>example.xroad-6.4.wsdl</wsdl.path>
</properties>
</profile>
Expand Down
8 changes: 8 additions & 0 deletions src/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@
<sonar.junit.reportPaths>common/target/surefire-reports,client/target/surefire-reports,rest/target/surefire-reports,server/target/surefire-reports</sonar.junit.reportPaths>
</properties>
<dependencies>
<!-- SOAP API for JRE 11 support -->
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>1.3.28</version>
<scope>runtime</scope>
</dependency>

<!-- Logging API: SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
Expand Down