Skip to content
Snippets Groups Projects
Commit a280b4ae authored by srosse's avatar srosse
Browse files

no-jira: enhance gitignore, modify pom to search build numbers with git

parent 925f6b25
No related branches found
No related tags found
No related merge requests found
/bin/
/target/
/cargo/
/.settings/
# deprecated scripting files
*.pl
*.php
# editor backup files
*~
*.bak
*.swp
# sundry useless files
*.out
mvn*.log
# Mac idiosyncrasies
.DS_Store
#ignore project/.classpath file at this gets created by maven
.classpath
.project
src/main/java/olat.local.properties
.classpath .classpath
/.project /.project
/.settings /.settings
...@@ -5,12 +31,4 @@ ...@@ -5,12 +31,4 @@
*.sw? *.sw?
*/.classpath */.classpath
*/.project */.project
*/.settings/*
*/.settings/org.eclipse.core.resources.prefs
*/.settings/org.eclipse.wst.common.component
*/.settings/org.eclipse.wst.common.project.facet.core.xml
*/.settings/org.eclipse.jdt.core.prefs
*/.settings/org.eclipse.m2e.core.prefs
*/.settings/org.eclipse.wst.jsdt.ui.*
*/.settings/org.sonarlint.*
*/.settings/.jsdtscope
\ No newline at end of file
...@@ -1198,22 +1198,22 @@ ...@@ -1198,22 +1198,22 @@
</testResource> </testResource>
</testResources> </testResources>
<plugins> <plugins>
<!-- Set the build number from mercurial --> <!-- Set the build number from git -->
<plugin> <plugin>
<groupId>org.openolat.mojo</groupId> <groupId>pl.project13.maven</groupId>
<artifactId>buildnumber-maven-plugin</artifactId> <artifactId>git-commit-id-plugin</artifactId>
<version>1.2.0</version> <version>2.2.4</version>
<executions> <executions>
<execution> <execution>
<phase>validate</phase> <id>get-the-git-infos</id>
<goals> <goals>
<goal>hgchangeset</goal> <goal>revision</goal>
</goals> </goals>
<phase>validate</phase>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<doCheck>true</doCheck> <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
<doUpdate>true</doUpdate>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
...@@ -1345,9 +1345,9 @@ ...@@ -1345,9 +1345,9 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest> </manifest>
<manifestEntries> <manifestEntries>
<Build-Change-Set>${changeSet}</Build-Change-Set> <Build-Change-Set>${git.commit.id}</Build-Change-Set>
<Build-Change-Set-Date>${changeSetDate}</Build-Change-Set-Date> <Build-Change-Set-Date>${git.commit.time}</Build-Change-Set-Date>
<Build-Revision-Number>${revisionNumber}</Build-Revision-Number> <Build-Revision-Number>${git.commit.id.abbrev}</Build-Revision-Number>
<Implementation-Build>${buildNumber}</Implementation-Build> <Implementation-Build>${buildNumber}</Implementation-Build>
</manifestEntries> </manifestEntries>
</archive> </archive>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment