locusworks/app-logger
4
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Updated project to work with jenkins

Browse Source
This commit is contained in:
Isaac Parenteau
2019-07-28 16:01:57 -05:00
parent a528965f92
commit 1bb7d4708b
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -166,9 +166,9 @@ def SetVersion( v ) {
version = branch_name_base + "." + build_number + "-RELEASE"; version = branch_name_base + "." + build_number + "-RELEASE";
//version = branch_name.substring('release/'.length()) + "." + build_number //version = branch_name.substring('release/'.length()) + "." + build_number
currentBuild.displayName = version currentBuild.displayName = version
} else if (v == 'develop') { } else if (v == 'develop') {
version = branch_name_base + "." + build_number + "-SNAPSHOT"; version = branch_name_base + "." + build_number + "-SNAPSHOT";
currentBuild.displayName = version currentBuild.displayName = version
} else { } else {
// for all other branches the version number is 0 with an appended build number // for all other branches the version number is 0 with an appended build number
// and for the display name use the jenkins default #n and add the branch name // and for the display name use the jenkins default #n and add the branch name
@ -182,4 +182,4 @@ def SetVersion( v ) {
} }
} }
return this return this

22
pom.xml
View File

@ -9,7 +9,7 @@
<description>Logger library for applications</description> <description>Logger library for applications</description>
<scm> <scm>
<url>ssh://git@devops.locusworks.net:7999/lwc/application-logger.git</url> <url>ssh://git@bitbucket.locusworks.net:7999/lwc/applogger.git</url>
</scm> </scm>
<organization> <organization>
<name>locusworks</name> <name>locusworks</name>
@ -22,14 +22,23 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<log4j.version>2.12.0</log4j.version> <log4j.version>2.12.0</log4j.version>
<slf4j.version>1.7.26</slf4j.version> <slf4j.version>1.7.26</slf4j.version>
<nexus.repo>http://nexus.locusworks.net</nexus.repo>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
<configuration>
<forkMode>always</forkMode>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugin</groupId> <groupId>org.apache.maven.plugin</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version> <version>3.7.0</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
@ -69,25 +78,26 @@
<repositories> <repositories>
<repository> <repository>
<id>nexus-proxy-public</id> <id>nexus-proxy-public</id>
<url>http://devops.locusworks.net:8081/repository/maven-public/</url> <url>${nexus.repo}/repository/maven-public/</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>nexus-proxy-public</id> <id>nexus-proxy-public</id>
<url>http://devops.locusworks.net:8081/repository/maven-public/</url> <url>${nexus.repo}/repository/maven-public/</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
<distributionManagement> <distributionManagement>
<snapshotRepository> <snapshotRepository>
<id>nexus-snapshot</id> <id>nexus-snapshot</id>
<url>http://devops.locusworks.net:8081/repository/locusworks-snapshot/</url> <url>${nexus.repo}/repository/locusworks-snapshot/</url>
</snapshotRepository> </snapshotRepository>
<repository> <repository>
<id>nexus-release</id> <id>nexus-release</id>
<url>http://devops.locusworks.net:8081/repository/locusworks-release/</url> <url>${nexus.repo}/repository/locusworks-release/</url>
</repository> </repository>
</distributionManagement> </distributionManagement>
</project> </project>