Skip to content

Jessica Hawkwell / candle-pos

Go to a project
Commit 208295d3 by Jessica Hawkwell
Options

Updates

1 parent 0bd4805d
Pipeline #116 failed in 0 seconds
Inline Side-by-side
Showing with 110 additions and 23 deletions
.gitlab-ci.yml
...@@ -20,15 +20,14 @@ stages: ...@@ -20,15 +20,14 @@ stages:
compile: compile:
stage: compile stage: compile
script: script:
- mvn $MAVEN_CLI_OPTS compile - mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS compile
artifacts: artifacts:
paths: paths:
- target - target
test: test:
stage: compile stage: compile
script: - mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS test-compile test
- mvn $MAVEN_CLI_OPTS test-compile test
artifacts: artifacts:
paths: paths:
- target - target
...@@ -38,14 +37,14 @@ package: ...@@ -38,14 +37,14 @@ package:
dependencies: dependencies:
- compile - compile
script: script:
- mvn $MAVEN_CLI_OPTS package - mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS package
site: site:
stage: package stage: package
dependencies: dependencies:
- test - test
script: script:
- mvn $MAVEN_CLI_OPTS site site:jar - mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS site site:jar
artifacts: artifacts:
paths: paths:
- target/site - target/site
...@@ -57,7 +56,7 @@ deploy: ...@@ -57,7 +56,7 @@ deploy:
- package - package
- site - site
script: script:
- mvn $MAVEN_CLI_OPTS deploy - mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS deploy
artifacts: artifacts:
paths: paths:
- target/*.jar - target/*.jar
...@@ -67,7 +66,7 @@ pages: ...@@ -67,7 +66,7 @@ pages:
dependencies: dependencies:
- site - site
script: script:
- mvn $MAVEN_CLI_OPTS site:stage - mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS site:stage
- mv target/staging public - mv target/staging public
artifacts: artifacts:
paths: paths:
......
pom.xml
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.starphoenixmedia</groupId> <groupId>com.starphoenixmedia</groupId>
<artifactId>candle_pos</artifactId> <artifactId>candle_pos</artifactId>
<version>1.0-SNAPSHOT</version> <packaging>jar</packaging>
<name>Candle POS</name> <name>Candle POS</name>
<version>1.0-SNAPSHOT</version>
<url>https://ladyserenakitty.felinewith.me/candle-pos/</url> <url>https://ladyserenakitty.felinewith.me/candle-pos/</url>
<organization> <organization>
<name>StarPhoenix Media</name> <name>StarPhoenix Media</name>
...@@ -15,25 +17,24 @@ ...@@ -15,25 +17,24 @@
<maven>3.0.0</maven> <maven>3.0.0</maven>
</prerequisites> </prerequisites>
<packaging>jar</packaging>
<properties> <properties>
<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>${env.GIT-REV}</rev> <rev>${GIT-REV}</rev>
<tag>master</tag>
</properties> </properties>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>internal</id> <id>releases</id>
<url>https://mvn.felinewith.me/repository/internal/</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>snapshots</id> <id>snapshots</id>
<url>https://mvn.felinewith.me/repository/snapshots/</url>
</snapshotRepository> </snapshotRepository>
<site> <site>
<id>Main</id> <id>Main</id>
<name>Candle POS</name>
<url>https://ladyserenakitty.felinewith.me/candle-pos/</url> <url>https://ladyserenakitty.felinewith.me/candle-pos/</url>
</site> </site>
</distributionManagement> </distributionManagement>
...@@ -51,8 +52,8 @@ ...@@ -51,8 +52,8 @@
<scm> <scm>
<connection>scm:git:https://felinewith.me/LadySerenaKitty/candle-pos.git</connection> <connection>scm:git:https://felinewith.me/LadySerenaKitty/candle-pos.git</connection>
<developerConnection>scm:git:[email protected]:LadySerenaKitty/candle-pos.git</developerConnection> <developerConnection>scm:git:[email protected]:LadySerenaKitty/candle-pos.git</developerConnection>
<tag>master</tag> <tag>${tag}</tag>
<url>https://felinewith.me/LadySerenaKitty/candle-pos</url> <url>https://felinewith.me/LadySerenaKitty/candle-pos/blob/${tag}/</url>
</scm> </scm>
<developers> <developers>
...@@ -60,13 +61,68 @@ ...@@ -60,13 +61,68 @@
<id>LadySerenaKitty</id> <id>LadySerenaKitty</id>
<name>Jessica Hawkwell</name> <name>Jessica Hawkwell</name>
<email>[email protected]</email> <email>[email protected]</email>
<organization>StarPhoenix Media</organization>
<organizationUrl>http://starphoenixmedia.com/</organizationUrl>
<properties>
<gab>@LadySerenaKitty</gab>
</properties>
<roles>
<role>Owner</role>
<role>Administrator</role>
<role>Developer</role>
</roles>
<timezone>-4</timezone>
</developer> </developer>
</developers> </developers>
<repositories>
<repository>
<id>releases</id>
<name>SPM Releases</name>
<url>https://mvn.felinewith.me/repository/releases/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>snapshots</id>
<name>SPM Snapshots</name>
<url>https://mvn.felinewith.me/repository/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>internal</id>
<name>SPM Internal</name>
<url>https://mvn.felinewith.me/repository/internal/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.0.2</version>
<configuration> <configuration>
...@@ -82,19 +138,35 @@ ...@@ -82,19 +138,35 @@
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
</plugin> <executions>
<plugin> <execution>
<groupId>org.apache.maven.plugins</groupId> <id>attach-javadoc</id>
<artifactId>maven-compiler-plugin</artifactId> <phase>prepare-package</phase>
<version>3.6.1</version> <configuration>
<configuration> <classifier>javadoc</classifier>
<showDeprecation>true</showDeprecation> </configuration>
</configuration> <goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.6</version> <version>3.6</version>
<executions>
<execution>
<id>attach-site</id>
<phase>prepare-package</phase>
<configuration>
<classifier>site</classifier>
</configuration>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
...@@ -267,4 +339,20 @@ ...@@ -267,4 +339,20 @@
<version>10.13.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles>
<profile>
<id>ci</id>
<activation>
<property>
<name>env.CI_COMMIT_REF_NAME</name>
</property>
</activation>
<properties>
<!-- Override only if necessary -->
<tag>${env.CI_COMMIT_REF_NAME}</tag>
</properties>
</profile>
</profiles>
</project> </project>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!