Skip to content

Commit

Permalink
Release 1.1.55
Browse files Browse the repository at this point in the history
  • Loading branch information
@predix-adoption-bot
predix-adoption-bot committed Nov 16, 2018
1 parent 4286ee4 commit 8f78943
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 115 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ If you are not using DevBox, ensure your development environment is configured w
| Maven | latest | https://artifactory.predix.io/artifactory/PREDIX-EXT |
| CloudFoundry ClI | 6.12.2 | https://github.com/cloudfoundry/cli/tree/v6.12.2#downloads. There is bug on this page, so you have to manually get the URL and the add "&version=6.12.2". For example for Windows32 it would look like this...https://cli.run.pivotal.io/stable?release=windows32&source=github&version=6.12.2 |

[![Analytics](https://ga-beacon.appspot.com/UA-82773213-1/predix-microservice-cf-jsr/readme?pixel)](https://github.com/PredixDev)
[![Analytics](https://predix-beacon.appspot.com/UA-82773213-1/predix-microservice-cf-jsr/readme?pixel)](https://github.com/PredixDev)
110 changes: 1 addition & 109 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.ge.predix.solsvc</groupId>
<artifactId>predix-microservice-cf-jsr</artifactId>
<version>1.1.53</version>
<version>1.1.55</version>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
Expand All @@ -27,7 +27,6 @@
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>2.12</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
<jacoco.version>0.8.1</jacoco.version>
<mockito-version>1.9.5</mockito-version>
<springockito-version>1.0.9</springockito-version>
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
Expand Down Expand Up @@ -190,85 +189,6 @@
<includes></includes>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<executions>
<!-- Prepares the property pointing to the JaCoCo runtime agent which
is passed as VM argument when Maven the Surefire plugin is executed. -->
<execution>
<id>pre-unit-test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
<!-- Sets the name of the property containing the settings for JaCoCo
runtime agent. <propertyName>surefireArgLine</propertyName> -->
<excludes>
<exclude>com/ge/predix/solsvc/boot/Application.class</exclude>
<exclude>com/ge/predix/solsvc/boot/PredixBootSecurityConfig.class</exclude>
<exclude>com/ge/predix/solsvc/spi/*.class</exclude>
<exclude>com/ge/predix/solsvc/boot/service/DefaultService.class</exclude>
<exclude>com/ge/predix/solsvc/boot/service/DynamicService.class</exclude>
</excludes>
</configuration>
</execution>
<!-- Ensures that the code coverage report for unit tests is created
after unit tests have been run. -->
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
</configuration>
</execution>

<execution>
<id>pre-integration-test</id>
<phase>pre-integration-test</phase>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
<!-- Sets the name of the property containing the settings for JaCoCo
runtime agent. <propertyName>failsafeArgLine</propertyName> -->
<excludes>
<exclude>com/ge/predix/solsvc/boot/Application.class</exclude>
<exclude>com/ge/predix/solsvc/boot/PredixBootSecurityConfig.class</exclude>
<exclude>com/ge/predix/solsvc/spi/*.class</exclude>
<exclude>com/ge/predix/solsvc/boot/service/DefaultService.class</exclude>
<exclude>com/ge/predix/solsvc/boot/service/DynamicService.class</exclude>
</excludes>
</configuration>
</execution>
<!-- Ensures that the code coverage report for integration tests after
integration tests have been run. -->
<execution>
<id>post-integration-test</id>
<phase>post-integration-test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<dataFile>${project.build.directory}/coverage-reports/jacoco-it.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand All @@ -295,34 +215,6 @@
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.jacoco</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<versionRange>
[0.7.2.201409121644,)
</versionRange>
<goals>
<goal>prepare-agent</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scripts/quickstart-microservice-cf-jsr.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ PRINT_USAGE=0
SKIP_SETUP=false
SKIP_PULL=false

IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/1.1.0/izon2.sh"
IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/1.2.0/izon2.sh"
SCRIPT="-script build-basic-app.sh -script-readargs build-basic-app-readargs.sh"
QUICKSTART_ARGS="-pxclimin 0.6.18 $SCRIPT -mst" # Added the mst flag
VERSION_JSON="version.json"
Expand Down
8 changes: 4 additions & 4 deletions version.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "Predix microservice jsr",
"version": "1.1.53",
"version": "1.1.55",
"private": true,
"dependencies": {
"local-setup": "https://github.com/PredixDev/local-setup#1.0.101",
"predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.167",
"predix-microservice-cf-jsr": "https://github.com/PredixDev/predix-microservice-cf-jsr#1.1.53"
"local-setup": "https://github.com/PredixDev/local-setup#1.0.102",
"predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.198",
"predix-microservice-cf-jsr": "https://github.com/PredixDev/predix-microservice-cf-jsr#1.1.55"
},
"author": "turnerth"
}

0 comments on commit 8f78943

Please sign in to comment.