summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Dürre <michael.duerre@highstreet-technologies.com>2020-08-21 06:56:48 +0200
committerKAPIL SINGAL <ks220y@att.com>2020-08-24 17:15:13 +0000
commit400aed4ddd71657b6c81bb6ec95b1fac2ad63e8e (patch)
tree8c9282db000dd7dba09a988791f6930b433f4eea
parentbe1fce412990f8e8f2ff8d338c50e29fdf47e8ad (diff)
fixes for J11
fix pom files for J11 compile issues Issue-ID: CCSDK-2680 Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com> Change-Id: Iaa7a426cdf947288af64d41a94d954a933217332 Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
-rw-r--r--ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml9
-rw-r--r--ms/sdclistener/application/pom.xml36
2 files changed, 42 insertions, 3 deletions
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml
index b71085f3d..88f7633a6 100644
--- a/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml
+++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml
@@ -38,6 +38,11 @@
<groupId>com.github.marcoferrer.krotoplus</groupId>
<artifactId>kroto-plus-coroutines</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
<build>
@@ -52,6 +57,7 @@
</protocArtifact>
<protoSourceRoot>${project.basedir}/../../../../../components/model-catalog/proto-definition/proto
</protoSourceRoot>
+ <jvmTarget>11</jvmTarget>
</configuration>
<executions>
<execution>
@@ -66,8 +72,7 @@
</goals>
<configuration>
<pluginId>grpc-java</pluginId>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
- </pluginArtifact>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
</execution>
<!--
diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml
index 45c3919e6..a44816af8 100644
--- a/ms/sdclistener/application/pom.xml
+++ b/ms/sdclistener/application/pom.xml
@@ -77,7 +77,12 @@
<artifactId>jmockit</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-omgapi</artifactId>
+ <version>3.8</version>
+ <scope>test</scope>
+ </dependency>
<!-- GRPC Dependencies -->
<dependency>
<groupId>io.grpc</groupId>
@@ -122,4 +127,33 @@
<artifactId>logback-classic</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <argLine>-Djdk.attach.allowAttachSelf=true ${surefireArgLine}</argLine>
+ <excludes>
+ <exclude>**/IT*.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <argLine>${surefireArgLine}</argLine>
+ <excludes>
+ <exclude>**/IT*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>