diff options
| author |   Lukasz Rajewski <lukasz.rajewski@orange.com> | 2020-08-11 17:46:51 +0200 |
|---|---|---|
| committer | Lukasz Rajewski <lukasz.rajewski@orange.com> | 2020-08-13 11:35:53 +0200 |
| commit | 7351cde6316dc9524bbc6856924456525802f9e1 (patch) | |
| tree | b56c994503ed27aacb7b36869276203659e0536f | |
| parent | df84ceb0f89fcf4c12dc13e809363c158492b430 (diff) | |
ArtifactBroker Java 11 Upgrade
ArtifactBroker Java 11 Upgrade
Issue-ID: REQ-351
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I4d45eb08889da2352796f5d2fbddfe453fb009da
| -rw-r--r-- | artifactbroker/main/pom.xml | 5 | ||||
| -rw-r--r-- | artifactbroker/packages/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | artifactbroker/packages/docker/artifact-dist.sh | 2 | ||||
| -rw-r--r-- | artifactbroker/packages/pom.xml | 2 | ||||
| -rw-r--r-- | artifactbroker/pom.xml | 37 |
5 files changed, 46 insertions, 4 deletions
diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index f4d6c61..afad215 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -35,6 +35,11 @@ <artifactId>multicloud-framework-artifactbroker-reception</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + </dependency> </dependencies> <build> diff --git a/artifactbroker/packages/docker/Dockerfile b/artifactbroker/packages/docker/Dockerfile index 364acb9..d107dce 100644 --- a/artifactbroker/packages/docker/Dockerfile +++ b/artifactbroker/packages/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -16,7 +16,7 @@ ENV ARTIFACT_DISTRIBUTION_HOME=${ARTIFACT_HOME}/distribution EXPOSE 9014 RUN apk add --no-cache --update busybox-extras bash nss procps coreutils findutils grep zip unzip \ - curl wget openssh openjdk8 maven jq httpie py-pip + curl wget openssh maven jq httpie py-pip RUN addgroup -S onap && \ adduser -S --shell /bin/bash -G onap onap diff --git a/artifactbroker/packages/docker/artifact-dist.sh b/artifactbroker/packages/docker/artifact-dist.sh index 94c1dfc..1ab79c5 100644 --- a/artifactbroker/packages/docker/artifact-dist.sh +++ b/artifactbroker/packages/docker/artifact-dist.sh @@ -19,7 +19,7 @@ # ============LICENSE_END========================================================= # -JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ +JAVA_HOME=/opt/java/openjdk ARTIFACT_DISTRIBUTION_HOME=/opt/app/distribution KEYSTORE="${ARTIFACT_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 9290a97..067040c 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -126,7 +126,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> + <version>3.0.0</version> <executions> <execution> <phase>install</phase> diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 67be674..4516ca2 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -133,6 +133,36 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> + <configuration> + <release>11</release> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireMavenVersion> + <version>3.0.5</version> + </requireMavenVersion> + <requireJavaVersion> + <version>11</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> <executions> @@ -190,6 +220,13 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <configuration> + <generateBackupPoms>false</generateBackupPoms> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> |