Skip to content

Commit 158a7d2

Browse files
committedMar 16, 2017
deployed presenting application to OCP
WIP: * integrations
1 parent 862a65c commit 158a7d2

File tree

6 files changed

+272
-263
lines changed

6 files changed

+272
-263
lines changed
 

‎brewing/build.gradle

+9-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
createDockerTaskWithPort(9992)
1+
2+
ext {
3+
fabric8 = true
4+
BOOT_VERSION='1.5.1.RELEASE'
5+
springboot = true
6+
groovy=false
7+
}
8+
9+
createDockerTaskWithPort(9992)

‎genpom.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
export WHAT_TO_TEST='EUREKA'
3+
./gradlew $1:generatePom

‎pom.tpl

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ project(xmlns:'http://maven.apache.org/POM/4.0.0',
1919
if (fabric8) {
2020
'fabric8.maven.plugin.version'("${f8mpVersion}")
2121
newLine()
22-
'fabric8.generator.spring-boot.activeProfiles'('ocp')
22+
'fabric8.generator.spring-boot.activeProfiles'('ocp','eureka')
2323
}
2424
newLine()
2525
'spring-boot-maven-plugin.version'('1.5.1.RELEASE')
@@ -64,6 +64,9 @@ project(xmlns:'http://maven.apache.org/POM/4.0.0',
6464
yieldUnescaped "${projectDeps}"
6565
newLine()
6666
build {
67+
if(groovy) {
68+
sourceDirectory('src/main/groovy')
69+
}
6770
resources {
6871
resource {
6972
directory('src/main/resources')
@@ -133,6 +136,7 @@ project(xmlns:'http://maven.apache.org/POM/4.0.0',
133136
phase('compile')
134137
configuration {
135138
tasks{
139+
mkdir(dir:"src/main/groovy")
136140
taskdef(name: 'groovyc', classname:'org.codehaus.groovy.ant.Groovyc'){
137141
classpath(refid: 'maven.compile.classpath')
138142
}
@@ -155,6 +159,7 @@ project(xmlns:'http://maven.apache.org/POM/4.0.0',
155159
phase('test-compile')
156160
configuration {
157161
tasks{
162+
mkdir(dir:"src/test/groovy")
158163
taskdef(name: 'groovyc', classname:'org.codehaus.groovy.ant.Groovyc'){
159164
classpath(refid: 'maven.test.classpath')
160165
}

‎presenting/pom.xml

+254-244
Large diffs are not rendered by default.

‎presenting/src/main/fabric8/profiles.yml

-11
This file was deleted.

‎presenting/src/main/resources/application-ocp.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
spring.application.name: presenting
2-
31
server.port: 8080
4-
5-
spring.rabbitmq.host:
6-
72
spring.rabbitmq.host: ${RABBITMQ_CLIENT_SERVICE_HOST}
8-
93
eureka:
104
client:
115
serviceUrl:

0 commit comments

Comments
 (0)
Please sign in to comment.