summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2017-08-15 19:12:25 -0500
committerJorge Hernandez <jh1730@att.com>2017-08-15 19:15:08 -0500
commitf9f086c4f7517602f7f8e862699618d79afddf58 (patch)
treed525e7b15d46c6f44f0eef2180d7fd735cc693cb
parent443205e307a5c84b0a4aa198bb66a6088e700adc (diff)
add persistence libraries in the installation base
to make db-enabled features to not worry about their packaging in the copy-dependencies plugin in the pom.xml Change-Id: Ie20a61978f75d4dbe82ac7aba5f6d259fb412f22 Issue-ID: POLICY-96 Signed-off-by: Jorge Hernandez <jh1730@att.com>
-rw-r--r--feature-eelf/pom.xml2
-rw-r--r--feature-healthcheck/pom.xml1
-rw-r--r--policy-core/pom.xml1
-rw-r--r--policy-endpoints/pom.xml1
-rw-r--r--policy-management/pom.xml38
-rw-r--r--policy-management/src/main/server-gen/bin/features2
-rw-r--r--policy-utils/pom.xml1
-rw-r--r--pom.xml19
8 files changed, 42 insertions, 23 deletions
diff --git a/feature-eelf/pom.xml b/feature-eelf/pom.xml
index a18b2892..17a9de9f 100644
--- a/feature-eelf/pom.xml
+++ b/feature-eelf/pom.xml
@@ -83,7 +83,6 @@
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
<includeScope>runtime</includeScope>
- <excludeScope>provided</excludeScope>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
@@ -117,7 +116,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/feature-healthcheck/pom.xml b/feature-healthcheck/pom.xml
index 3355a2a5..32aa4d1c 100644
--- a/feature-healthcheck/pom.xml
+++ b/feature-healthcheck/pom.xml
@@ -83,7 +83,6 @@
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
<includeScope>runtime</includeScope>
- <excludeScope>provided</excludeScope>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 902c38cb..8fdfaa36 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -61,7 +61,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml
index b34b6d33..020d3c11 100644
--- a/policy-endpoints/pom.xml
+++ b/policy-endpoints/pom.xml
@@ -174,7 +174,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
<scope>test</scope>
</dependency>
diff --git a/policy-management/pom.xml b/policy-management/pom.xml
index 4e375d55..e3196604 100644
--- a/policy-management/pom.xml
+++ b/policy-management/pom.xml
@@ -86,7 +86,7 @@
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
<excludeGroupIds>javax.inject</excludeGroupIds>
- <excludeScope>provided</excludeScope>
+ <includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
@@ -235,26 +235,32 @@
<version>4.1</version>
</dependency>
- <!-- This entry is necessary to support import "org.apache.commons.lang3.time.DateUtils"
- reference in StandbyStateManagementTest.java -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.4</version>
- </dependency>
-
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!--
+ The following dependencies are for features and drools
+ applications usage
+ -->
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features
index 057abeb4..80a1b279 100644
--- a/policy-management/src/main/server-gen/bin/features
+++ b/policy-management/src/main/server-gen/bin/features
@@ -301,7 +301,7 @@ function enableDepAnalysis ()
multiVersionJars=$(ls "${LIB}"/"${depJarName%%-[0-9]*.jar}"-*.jar 2> /dev/null)
if [[ -n "${multiVersionJars}" ]]; then
- echo "warning: other version of library ${depJarName} present: ${multiVersionJars}"
+ echo "error: other version of library ${depJarName} present: ${multiVersionJars}"
return 2
fi
done
diff --git a/policy-utils/pom.xml b/policy-utils/pom.xml
index 309839d5..7481f424 100644
--- a/policy-utils/pom.xml
+++ b/policy-utils/pom.xml
@@ -40,7 +40,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 08c27c3c..81d41c32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,10 @@
<http.client.version>4.5</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>
+ <mariadb.jdbc.version>2.1.0</mariadb.jdbc.version>
+
<sonar.plugin.version>3.2</sonar.plugin.version>
<jacoco.plugin.version>0.7.9</jacoco.plugin.version>
@@ -167,6 +171,21 @@
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.jdbc.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>