diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | sparkybe-onap-application/pom.xml | 30 | ||||
| -rw-r--r-- | sparkybe-onap-service/pom.xml | 105 | ||||
| -rw-r--r-- | version.properties | 2 |
5 files changed, 8 insertions, 132 deletions
@@ -1,6 +1,7 @@ .classpath .project .settings/ +.vscode aaiOffline/ target/ logs/ @@ -11,7 +11,7 @@ <groupId>org.onap.aai</groupId> <artifactId>sparky-be</artifactId> - <version>2.0.4-SNAPSHOT</version> + <version>2.0.5-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-sparky-be</name> diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index 83d6b1c..3b0301b 100644 --- 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> - <version>2.0.4-SNAPSHOT</version> + <version>2.0.5-SNAPSHOT</version> </parent> <groupId>org.onap.aai.sparky-be</groupId> <artifactId>sparkybe-onap-application</artifactId> - <version>2.0.4-SNAPSHOT</version> + <version>2.0.5-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -130,32 +130,12 @@ </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> - <!-- 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> @@ -173,11 +153,6 @@ <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> @@ -582,6 +557,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> + <version>2.7</version> <executions> <execution> <phase/> diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml index b62de3a..7647010 100644 --- 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> - <version>2.0.4-SNAPSHOT</version> + <version>2.0.5-SNAPSHOT</version> </parent> <groupId>org.onap.aai.sparky-be</groupId> <artifactId>sparkybe-onap-service</artifactId> - <version>2.0.4-SNAPSHOT</version> + <version>2.0.5-SNAPSHOT</version> <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> - - <!-- 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> - <!-- 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> @@ -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> - <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> @@ -430,81 +404,6 @@ some of the depedencies should probably have a scope of provided so they don't a </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> diff --git a/version.properties b/version.properties index dd10411..99190ec 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=2 minor=0 -patch=4 +patch=5 base_version=${major}.${minor}.${patch} |