Skip to content

User defined properties #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ninjagumby wants to merge 28 commits into
base: master
Choose a base branch
from
Open

User defined properties #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fa1d6fd
updatign to remove jfrog
avinci Oct 31, 2016
9fb3870
resetting jf
avinci Dec 21, 2016
a0ea1ed
resetting jf
avinci Dec 21, 2016
7ce5e3e
resetting jf
avinci Dec 21, 2016
4c48359
pushing to jf
avinci Dec 22, 2016
ee7cfee
pushing to jf
avinci Dec 22, 2016
120eb00
pushing to jf
avinci Dec 22, 2016
c9eb06c
pushing to jf
avinci Dec 22, 2016
a9cda4a
pushing to jf
avinci Dec 22, 2016
9a833d1
pushing to jf
avinci Dec 22, 2016
23e3088
pushing to jf
avinci Dec 22, 2016
3f299ac
pushing to jf
avinci Dec 22, 2016
d0072ac
pushing to jf
avinci Dec 22, 2016
775b118
pushing to jf
avinci Dec 22, 2016
71d5e54
pushing to jf
avinci Dec 22, 2016
9d8498a
pushing to jf
avinci Dec 22, 2016
ab6987d
pushing to jf
avinci Dec 22, 2016
8546ea9
pushing to jf
avinci Dec 22, 2016
2fc123a
adding trigger
avinci Dec 22, 2016
22e8900
adding sample
avinci Dec 22, 2016
e4a6003
resetting yml
avinci Dec 22, 2016
6dca208
removing docker refs
avinci Dec 22, 2016
fb484b0
initial trigger
avinci Dec 22, 2016
ec7df3f
trying out main war
avinci Jan 3, 2017
e0e68aa
adding HelloWorld
avinci Jan 5, 2017
f5e4958
adding HelloWorld
avinci Jan 5, 2017
84af2ce
Created an API that can GET, PUT, and POST user defined properties.
Jan 27, 2017
ccaedf1
no message
Jan 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ target/
# misc
local-test.sh
mvncolor.sh
shippable/
/shippable/
56 changes: 0 additions & 56 deletions .m2/settings.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Dockerfile
View file
Open in desktop

This file was deleted.

160 changes: 73 additions & 87 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.shipfmrsamplejava</groupId>
<artifactId>helloworld</artifactId>
<groupId>com.shippable</groupId>
<artifactId>properties</artifactId>
<packaging>war</packaging>
<version>0.0.1-SNAPSHOT</version>
<name>HelloWorld Maven Webapp</name>
<name>Shippable Properties Maven Webapp</name>
<url>http://maven.apache.org</url>

<properties>
<spring.version>4.3.2.RELEASE</spring.version>
<docker.image.prefix>ttrahan</docker.image.prefix>
</properties>

<distributionManagement>
<snapshotRepository>
<id>snapshots</id>
<name>shipdemo-snapshots</name>
<url>https://shipdemo.jfrog.io/shipdemo/libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand All @@ -47,61 +39,72 @@
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.5.RELEASE</version>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.5.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>1.4.0.RELEASE</version>
<!-- <exclusions>
<exclusion>
<groupId>logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions> -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>1.4.0.RELEASE</version>
</dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>1.4.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>1.4.0.RELEASE</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>1.4.0.RELEASE</version>
<scope>provided</scope>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>1.4.0.RELEASE</version>
<scope>provided</scope>
</dependency>
<!-- <dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>1.4.0.RELEASE</version>
<scope>provided</scope>
</dependency> -->

<!-- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> -->
</dependencies>

<build>
<finalName>HelloWorld</finalName>
<finalName>Shippable-Properties</finalName>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.8</version>
<configuration>
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
</configuration>
<executions>
<execution>
<id>jacoco-initialize</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>jacoco-site</id>
<phase>package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -112,38 +115,21 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<reportsDirectory>shippable/testresults</reportsDirectory>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>2.19.1</version>
</dependency>
</dependencies>
</plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<formats>
<format>xml</format>
</formats>
<outputDirectory>shippable/codecoverage</outputDirectory>
<exclusions>
<exclusion>
<groupId>logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</configuration>
</plugin> -->
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<reportsDirectory>shippable/testresults</reportsDirectory>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>2.19.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
40 changes: 19 additions & 21 deletions shippable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,33 @@ language: java
jdk:
- oraclejdk8

branches:
only:
- github-beta

env:
global:
- secure: pTctULZoZ0Ejip41hbaQq9HpfHE/TAIrcWZlZ2yDSQ4FDK4TllXTAZe/A6nWf+0mZ4JKMxYQcNaum52xtFUAmfyg+mpqJksedfZPcLmyev8AqWunUS1DSDi2MZ0po+ou4uUUYE/7ewT42HXyVSi/Rvx6MWsNqzv5k/sTQEq79FGXgnJ91JzWi/Mp1YzA5jm/yvd02OepLcqBXSyYr9QFqlI0xUuLj6Asenp2rT8Yq4wLQOIyQbBCdxaBKbni+tM4QdbfJrCEClK/MB/X0rVymO9eOA1TzoqxszldDbaPXzsum0cbLpPwPP4Ix3R+jLQxvjQ3fC7OM/QgpS0bfLXfoQ==

build:
pre_ci_boot:
image_name: drydock/u14
image_tag: tip
pull: false
options: '--privileged=true --net=bridge'

ci:
- sudo wget http://mirrors.ibiblio.org/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
- sudo tar xzf apache-maven-3.3.9-bin.tar.gz -C /usr/local && rm -f apache-maven-3.3.9-bin.tar.gz
- ln -fs /usr/local/apache-maven-$3.3.9/bin/mvn /usr/bin
- echo "export PATH=$PATH:/usr/local/apache-maven-3.3.9/bin" >> $HOME/.bashrc
- wget http://138.197.80.53:8080/docs/appdev/sample/sample.war
- mkdir -p shippable/testresults && mkdir -p shippable/codecoverage
- sed -i "s/{PASSWORD}/$PASSWORD/" .m2/settings.xml
- mvn -q -B -s .m2/settings.xml -U clean cobertura:cobertura deploy
- docker build -t ttrahan/javahelloworld:$BRANCH.$BUILD_NUMBER .
- docker push ttrahan/javahelloworld:$BRANCH.$BUILD_NUMBER
- /usr/local/apache-maven-3.3.9/bin/mvn -q -B clean cobertura:cobertura install
- ls -al $SHIPPABLE_BUILD_DIR/target
- jfrog rt u $SHIPPABLE_BUILD_DIR/target/HelloWorld.war builds/HelloWorld.war
- ls $SHIPPABLE_BUILD_DIR/target

integrations:
hub:
- integrationName: ttrahan-dh
type: docker
- integrationName: avinci-jf
type: artifactory

notifications:
- integrationName: trigger-javahello-pipeline
- integrationName: demo-jar-trg
type: webhook
payload:
- versionName=$BRANCH.$BUILD_NUMBER
branches:
only:
- github-beta
- versionName=$BUILD_NUMBER
on_success: always
on_failure: never
on_start: never
30 changes: 0 additions & 30 deletions src/main/java/com/shipfmrsamplejava/helloworld/controller/HelloWorldController.java
View file
Open in desktop

This file was deleted.

Loading