branch builds
This commit is contained in:
parent
d42b8ab88b
commit
4ba3dc6efa
@ -6,25 +6,26 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="Maven: com.atlassian.bamboo:bamboo-specs-api:7.1.2" level="project" />
|
<orderEntry type="library" name="Maven: com.atlassian.bamboo:bamboo-specs-api:7.2.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
|
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.0" level="project" />
|
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.0" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.atlassian.bamboo:bamboo-specs:7.1.2" level="project" />
|
<orderEntry type="library" name="Maven: com.atlassian.bamboo:bamboo-specs:7.2.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
|
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
|
||||||
<orderEntry type="library" name="Maven: commons-validator:commons-validator:1.5.1" level="project" />
|
<orderEntry type="library" name="Maven: commons-validator:commons-validator:1.7" level="project" />
|
||||||
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
|
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
|
||||||
<orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8.1" level="project" />
|
<orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
|
||||||
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
|
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
|
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
|
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
|
||||||
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
|
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.atlassian.bamboo</groupId>
|
<groupId>com.atlassian.bamboo</groupId>
|
||||||
<artifactId>bamboo-specs-parent</artifactId>
|
<artifactId>bamboo-specs-parent</artifactId>
|
||||||
<version>7.1.2</version>
|
<version>7.2.2</version>
|
||||||
<relativePath/>
|
<relativePath/>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -37,5 +37,5 @@ then
|
|||||||
else
|
else
|
||||||
echo "Not on a relevant branch $BRANCH_NAME ... skipping."
|
echo "Not on a relevant branch $BRANCH_NAME ... skipping."
|
||||||
|
|
||||||
echo "APP_VERSION=$bamboo_planRepository_branchName" > version.properties
|
echo "APP_VERSION=$bamboo_planRepository_branchName_$bamboo_buildNumber" > version.properties
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user