diff options
| -rw-r--r-- | policy-core/pom.xml | 2 | ||||
| -rw-r--r-- | policy-management/pom.xml | 10 | ||||
| -rw-r--r-- | policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java | 3 | ||||
| -rw-r--r-- | policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java | 4 | ||||
| -rw-r--r-- | policy-management/src/main/server/config/system.properties | 12 | ||||
| -rw-r--r-- | pom.xml | 49 |
6 files changed, 64 insertions, 16 deletions
diff --git a/policy-core/pom.xml b/policy-core/pom.xml index 8fdfaa36..076a4bf2 100644 --- a/policy-core/pom.xml +++ b/policy-core/pom.xml @@ -40,13 +40,11 @@ <groupId>org.kie</groupId> <artifactId>kie-ci</artifactId> <version>6.5.0.Final</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> <version>6.5.0.Final</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.drools</groupId> diff --git a/policy-management/pom.xml b/policy-management/pom.xml index b01668b0..63914922 100644 --- a/policy-management/pom.xml +++ b/policy-management/pom.xml @@ -257,6 +257,11 @@ </dependency> <dependency> + <groupId>org.eclipse.persistence</groupId> + <artifactId>org.eclipse.persistence.jpa</artifactId> + </dependency> + + <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> </dependency> @@ -270,6 +275,11 @@ <groupId>org.hibernate.common</groupId> <artifactId>hibernate-commons-annotations</artifactId> </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> </dependencies> diff --git a/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java index d877f1e9..379ca6a2 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java +++ b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java @@ -2299,6 +2299,7 @@ public class RestManager { @GET @Path("engine/tools/loggers/{logger}") + @Produces(MediaType.TEXT_PLAIN) @ApiOperation( value="logging level of a logger" ) @@ -2326,6 +2327,8 @@ public class RestManager { @PUT @Path("engine/tools/loggers/{logger}/{level}") + @Produces(MediaType.TEXT_PLAIN) + @Consumes(MediaType.TEXT_PLAIN) @ApiOperation( value="sets the logger level", notes="Please use the SLF4J logger levels" diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java index d7e0ecdd..bfda2450 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java @@ -429,11 +429,11 @@ class PolicyEngineManager implements PolicyEngine { defaultConfig.put(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + TELEMETRY_SERVER_DEFAULT_NAME + PolicyProperties.PROPERTY_HTTP_SWAGGER_SUFFIX, - true); + "" + Boolean.TRUE); defaultConfig.put(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + TELEMETRY_SERVER_DEFAULT_NAME + PolicyProperties.PROPERTY_MANAGED_SUFFIX, - false); + "" + Boolean.FALSE); return defaultConfig; } diff --git a/policy-management/src/main/server/config/system.properties b/policy-management/src/main/server/config/system.properties index 6456ef53..a968b103 100644 --- a/policy-management/src/main/server/config/system.properties +++ b/policy-management/src/main/server/config/system.properties @@ -22,17 +22,17 @@ # jmx -com.sun.management.jmxremote.port = 9991 -com.sun.management.jmxremote.authenticate = false -com.sun.management.jmxremote.ssl = false +com.sun.management.jmxremote.port=9991 +com.sun.management.jmxremote.authenticate=false +com.sun.management.jmxremote.ssl=false # certs javax.net.ssl.keyStore=/opt/app/policy/etc/ssl/policy-keystore -javax.net.ssl.keyStorePassword = ${{KEYSTORE_PASSWD}} +javax.net.ssl.keyStorePassword=${{KEYSTORE_PASSWD}} javax.net.ssl.trustStore=/opt/app/policy/etc/ssl/policy-keystore -javax.net.ssl.trustStorePassword = ${{KEYSTORE_PASSWD}} +javax.net.ssl.trustStorePassword=${{KEYSTORE_PASSWD}} # standard logging -logback.configurationFile=config/logback.xml
\ No newline at end of file +logback.configurationFile=config/logback.xml @@ -46,14 +46,16 @@ <jersey.version>2.22.2</jersey.version> <jersey.swagger.version>1.5.13</jersey.swagger.version> <jackson.version>2.8.4</jackson.version> - <http.client.version>4.5</http.client.version> + <http.client.version>4.5.2</http.client.version> <http.core.version>4.4.4</http.core.version> <logback.version>1.2.3</logback.version> <junit.version>4.12</junit.version> - <eclipselink.version>2.6.4</eclipselink.version> + <eclipselink.version>2.7.0</eclipselink.version> <mariadb.jdbc.version>2.1.0</mariadb.jdbc.version> <hibernate.core.version>5.2.10.Final</hibernate.core.version> <hibernate.commons.annotations.version>5.0.1.Final</hibernate.commons.annotations.version> + <commons.io.version>2.5</commons.io.version> + <guava.version>16.0.1</guava.version> <nexusproxy>https://nexus.onap.org</nexusproxy> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -91,14 +93,12 @@ </site> </distributionManagement> - <dependencies/> - <dependencyManagement> <dependencies> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>16.0.1</version> + <version>${guava.version}</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> @@ -176,6 +176,11 @@ <version>${eclipselink.version}</version> </dependency> <dependency> + <groupId>org.eclipse.persistence</groupId> + <artifactId>org.eclipse.persistence.jpa</artifactId> + <version>${eclipselink.version}</version> + </dependency> + <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> <version>${mariadb.jdbc.version}</version> @@ -190,8 +195,29 @@ <artifactId>hibernate-commons-annotations</artifactId> <version>${hibernate.commons.annotations.version}</version> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> </dependencies> </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.onap.oparent</groupId> + <artifactId>version-check-maven-plugin</artifactId> + <version>1.0.0-SNAPSHOT</version> + <scope>provided</scope> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> <build> <plugins> @@ -234,7 +260,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.6</version> <dependencies> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -252,7 +277,19 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>sonar-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.onap.oparent</groupId> + <artifactId>version-check-maven-plugin</artifactId> + <executions> + <execution> + <id>version-check</id> + <phase/> + </execution> + </executions> </plugin> + </plugins> <pluginManagement> <plugins> |