Cleanup sparky-be pom

- remove duplicate declarations of dependencies
- declare version for cobertura plugin

Issue-ID: AAI-3859
Change-Id: I257883ed26bab9483d412c8b3e4abb2abd55adc4
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/.gitignore b/.gitignore
index a336b99..3ebf204 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .classpath
 .project
 .settings/
 .classpath
 .project
 .settings/

+.vscode

 aaiOffline/
 target/
 logs/
 aaiOffline/
 target/
 logs/

diff --git a/docs/tox.ini b/docs/tox.ini
index b9d7eb4..46075fa 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -7,7 +7,7 @@ skipsdist = true
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt

-    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://releases.openstack.org/constraints/upper/yoga

     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html


@@ -16,7 +16,7 @@ commands =
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt

-    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://releases.openstack.org/constraints/upper/yoga

     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck


@@ -25,7 +25,7 @@ commands =
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt

-    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://releases.openstack.org/constraints/upper/yoga

     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck

diff --git a/pom.xml b/pom.xml
index 0ffa314..908afa2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     
     <groupId>org.onap.aai</groupId>
     <artifactId>sparky-be</artifactId>
     
     <groupId>org.onap.aai</groupId>
     <artifactId>sparky-be</artifactId>

-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>

     <packaging>pom</packaging>
     <name>aai-sparky-be</name>
 
     <packaging>pom</packaging>
     <name>aai-sparky-be</name>
 

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index c115d1c..3b0301b 100644 (file)
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -5,12 +5,12 @@
        <parent>
          <groupId>org.onap.aai</groupId>
          <artifactId>sparky-be</artifactId>
        <parent>
          <groupId>org.onap.aai</groupId>
          <artifactId>sparky-be</artifactId>

-         <version>2.0.3-SNAPSHOT</version>
+         <version>2.0.5-SNAPSHOT</version>

        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-application</artifactId>
        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-application</artifactId>

-       <version>2.0.3-SNAPSHOT</version>
+       <version>2.0.5-SNAPSHOT</version>

        <packaging>jar</packaging>
 
     <properties>
        <packaging>jar</packaging>
 
     <properties>


@@ -36,7 +36,7 @@
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
         <aai.base.image>alpine</aai.base.image>
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
         <aai.base.image>alpine</aai.base.image>

-        <aai.base.image.version>1.8.1</aai.base.image.version>
+        <aai.base.image.version>1.13.2</aai.base.image.version>

         <!-- This will be used for the docker images as the default format of maven build has issues -->
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
         <!-- This will be used for the docker images as the default format of maven build has issues -->
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>


@@ -130,32 +130,12 @@
             </exclusions>
         </dependency>
 
             </exclusions>
         </dependency>
 

-        <!-- Camel BOM -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring-boot-dependencies</artifactId>
-            <version>${camel-spring-boot.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
-        <!-- <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId>
-            </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId>
-            </dependency> -->
-

         <!-- Camel -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-spring-boot-starter</artifactId>
         </dependency>
 
         <!-- Camel -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-spring-boot-starter</artifactId>
         </dependency>
 

-        <!-- https://mvnrepository.com/artifact/org.apache.camel/camel-restlet -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-restlet</artifactId>
-        </dependency>
-

         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>


@@ -173,11 +153,6 @@
             <artifactId>camel-servlet-starter</artifactId>
         </dependency>
 
             <artifactId>camel-servlet-starter</artifactId>
         </dependency>
 

-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-

                <dependency>
                        <groupId>org.onap.aai.sparky-be</groupId>
                        <artifactId>sparkybe-onap-service</artifactId>
                <dependency>
                        <groupId>org.onap.aai.sparky-be</groupId>
                        <artifactId>sparkybe-onap-service</artifactId>


@@ -582,6 +557,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>

+                <version>2.7</version>

                 <executions>
                     <execution>
                         <phase/>
                 <executions>
                     <execution>
                         <phase/>

diff --git a/sparkybe-onap-application/src/main/scripts/start.sh b/sparkybe-onap-application/src/main/scripts/start.sh
index b4e1083..808be7b 100644 (file)
--- a/sparkybe-onap-application/src/main/scripts/start.sh
+++ b/sparkybe-onap-application/src/main/scripts/start.sh
@@ -21,4 +21,4 @@ set -x
 #
 cd $APP_HOME
 
 #
 cd $APP_HOME
 

-${JAVA_CMD} -Xms1024m -Xmx4096m $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar 
+${JAVA_CMD} ${JVM_ARGS} $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar 

diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index ef1961e..7647010 100644 (file)
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -4,12 +4,12 @@
        <parent>
          <groupId>org.onap.aai</groupId>
          <artifactId>sparky-be</artifactId>
        <parent>
          <groupId>org.onap.aai</groupId>
          <artifactId>sparky-be</artifactId>

-         <version>2.0.3-SNAPSHOT</version>
+         <version>2.0.5-SNAPSHOT</version>

        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-service</artifactId>
        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-service</artifactId>

-       <version>2.0.3-SNAPSHOT</version>
+       <version>2.0.5-SNAPSHOT</version>

        <packaging>jar</packaging>
 
        <properties>
        <packaging>jar</packaging>
 
        <properties>


@@ -123,33 +123,12 @@ some of the depedencies should probably have a scope of provided so they don't a
                        </exclusions>
                </dependency>
 
                        </exclusions>
                </dependency>
 

-
-               <!-- Camel BOM -->
-               <dependency>
-                       <groupId>org.apache.camel</groupId>
-                       <artifactId>camel-spring-boot-dependencies</artifactId>
-                       <version>${camel-spring-boot.version}</version>
-                       <type>pom</type>
-                       <scope>import</scope>
-               </dependency>
-
-               <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
-               <!-- <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId>
-                       </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId>
-                       </dependency> -->
-

                <!-- Camel -->
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-spring-boot-starter</artifactId>
                </dependency>
 
                <!-- Camel -->
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-spring-boot-starter</artifactId>
                </dependency>
 

-               <!-- https://mvnrepository.com/artifact/org.apache.camel/camel-restlet -->
-               <dependency>
-                       <groupId>org.apache.camel</groupId>
-                       <artifactId>camel-restlet</artifactId>
-               </dependency>
-

                <dependency>
                        <groupId>commons-io</groupId>
                        <artifactId>commons-io</artifactId>
                <dependency>
                        <groupId>commons-io</groupId>
                        <artifactId>commons-io</artifactId>


@@ -167,11 +146,6 @@ some of the depedencies should probably have a scope of provided so they don't a
                        <artifactId>camel-servlet-starter</artifactId>
                </dependency>
 
                        <artifactId>camel-servlet-starter</artifactId>
                </dependency>
 

-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-actuator</artifactId>
-               </dependency>
-

                <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
                <dependency>
                        <groupId>commons-cli</groupId>
                <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
                <dependency>
                        <groupId>commons-cli</groupId>


@@ -430,81 +404,6 @@ some of the depedencies should probably have a scope of provided so they don't a
                </pluginManagement>
 
                <plugins>
                </pluginManagement>
 
                <plugins>

-<!--                   <plugin>
-                               <groupId>org.springframework.boot</groupId>
-                               <artifactId>spring-boot-maven-plugin</artifactId>
-                       </plugin>
- -->
-
-       <!--            <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.7</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-docker-file</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>target</outputDirectory>
-                                                       <overwrite>true</overwrite>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>${basedir}/src/main/docker</directory>
-                                                                       <filtering>true</filtering>
-                                                                       <includes>
-                                                                               <include>**/*</include>
-                                                                       </includes>
-                                                               </resource>
-                                                               <resource>
-                                                                       <directory>${basedir}/src/main/bin/</directory>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin> -->
-
-<!--                   <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <version>3.0.0</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-installed</id>
-                                               <phase>install</phase>
-                                               <goals>
-                                                       <goal>copy</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>${frontEndGroupdId}</groupId>
-                                                                       <artifactId>${frontEndArtifactId}</artifactId>
-                                                                       <version>${frontEndVersion}</version>
-                                                                       <type>war</type>
-                                                                       <outputDirectory>${basedir}/target/</outputDirectory>
-                                                                       <destFileName>aai.war</destFileName>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
- -->
-
-<!--                   <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>cobertura-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <phase />
-                                       </execution>
-                               </executions>
-                       </plugin>
- -->

                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>

diff --git a/version.properties b/version.properties
index 9bb11f5..99190ec 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=2
 minor=0
 
 major=2
 minor=0

-patch=3
+patch=5

 
 base_version=${major}.${minor}.${patch}
 
 
 base_version=${major}.${minor}.${patch}