Skip to content

Jessica Hawkwell / candle-pos

Go to a project
Commit 03362a16 by Jessica Hawkwell
Options

Updating for format

1 parent 2ab34477
Pipeline #137 failed
in 1 minute 42 seconds
Inline Side-by-side
Showing with 71 additions and 8 deletions
pom.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<description>Point-of-sale purpose built for candle makers.</description> <description>Point-of-sale purpose built for candle makers.</description>
<url>https://ladyserenakitty.felinewith.me/candle-pos/</url> <url>${gl.pages}</url>
<organization> <organization>
<name>StarPhoenix Media</name> <name>StarPhoenix Media</name>
<url>http://starphoenixmedia.com/</url> <url>http://starphoenixmedia.com/</url>
...@@ -22,8 +22,15 @@ ...@@ -22,8 +22,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<rev>${git-rev}</rev>
<tag>master</tag> <tag>master</tag>
<rev>~${env.USER}</rev>
<fulltag>${tag}/${rev}</fulltag>
<fullver>${project.name} ${project.version} (${fulltag})</fullver>
<gl.group>LadySerenaKitty</gl.group>
<gl.group-url>ladyserenakitty</gl.group-url>
<gl.name>server-management</gl.name>
<gl.url>https://felinewith.me/${gl.group-url}/${gl.name}</gl.url>
<gl.pages>https://${gl.group-url}.felinewith.me/${gl.name}/</gl.pages>
</properties> </properties>
<distributionManagement> <distributionManagement>
...@@ -46,19 +53,19 @@ ...@@ -46,19 +53,19 @@
<issueManagement> <issueManagement>
<system>GitLab</system> <system>GitLab</system>
<url>https://felinewith.me/LadySerenaKitty/candle-pos/issues</url> <url>${gl.url}/issues</url>
</issueManagement> </issueManagement>
<ciManagement> <ciManagement>
<system>GitLab CI</system> <system>GitLab CI</system>
<url>https://felinewith.me/LadySerenaKitty/candle-pos/pipelines</url> <url>${gl.url}/pipelines</url>
</ciManagement> </ciManagement>
<scm> <scm>
<connection>scm:git:https://felinewith.me/LadySerenaKitty/candle-pos.git</connection> <connection>scm:git:${gl.url}.git</connection>
<developerConnection>scm:git:[email protected]:LadySerenaKitty/candle-pos.git</developerConnection> <developerConnection>scm:git:[email protected]:${gl.group-url}/${gl.name}.git</developerConnection>
<tag>${tag}</tag> <tag>${tag}</tag>
<url>https://felinewith.me/LadySerenaKitty/candle-pos/blob/${tag}/</url> <url>${gl.url}/blob/${tag}/</url>
</scm> </scm>
<developers> <developers>
...@@ -187,11 +194,21 @@ ...@@ -187,11 +194,21 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId> <artifactId>maven-changelog-plugin</artifactId>
<version>2.3</version> <version>2.3</version>
<configuration>
<providerImplementations>
<git>jgit</git>
</providerImplementations>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId> <artifactId>maven-changes-plugin</artifactId>
<version>2.12.1</version> <version>2.12.1</version>
<configuration>
<providerImplementations>
<git>jgit</git>
</providerImplementations>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -243,6 +260,28 @@ ...@@ -243,6 +260,28 @@
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>1.9.5</version>
<configuration>
<providerImplementations>
<git>jgit</git>
</providerImplementations>
</configuration>
<!-- dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-jgit</artifactId>
<version>1.9.5</version>
</dependency>
</dependencies -->
</plugin>
<!-- plugin>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-jgit</artifactId>
<version>1.9.5</version>
</plugin -->
</plugins> </plugins>
</reporting> </reporting>
...@@ -363,6 +402,30 @@ ...@@ -363,6 +402,30 @@
<tag>${env.CI_COMMIT_REF_NAME}</tag> <tag>${env.CI_COMMIT_REF_NAME}</tag>
</properties> </properties>
</profile> </profile>
<profile>
<id>rev-env</id>
<activation>
<property>
<name>env.GIT_REV</name>
</property>
</activation>
<properties>
<!-- Override only if necessary -->
<rev>${env.GIT_REV}</rev>
</properties>
</profile>
<profile>
<id>rev-cli</id>
<activation>
<property>
<name>git-rev</name>
</property>
</activation>
<properties>
<!-- Override only if necessary -->
<rev>${git-rev}</rev>
</properties>
</profile>
</profiles> </profiles>
</project> </project>
src/site/site.xml
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<body> <body>
<breadcrumbs> <breadcrumbs>
<item name="${project.name} (${project.rev})" href="${project.url}" /> <item name="${project.name} (${project.fulltag})" href="${project.url}" />
</breadcrumbs> </breadcrumbs>
<menu name="Project Information" ref="reports" inherit="bottom" /> <menu name="Project Information" ref="reports" inherit="bottom" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!