Skip to content

Commit aba9f11

Browse files
Elisabeth Stockingermbraeger
Elisabeth Stockinger
authored andcommittedMar 29, 2021
Fix typo in maven description, activate compiler plugin
1 parent f759cb3 commit aba9f11

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed
 

‎.gitlab-ci.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ build:
3030
tags:
3131
- docker-privileged
3232
script:
33-
- mvn -B test --settings settings-ci.xml
33+
- mvn -B test -DskipDockerBuild -DskipDockerTag --settings settings-ci.xml
3434
except:
3535
- tags
3636
- master
@@ -42,13 +42,12 @@ sonar_preview:
4242
except:
4343
- master
4444
- tags
45+
- develop
4546

4647
quality_assurance:
4748
stage: sonar
4849
script:
4950
- mvn package sonar:sonar -Ddependencies.set.all -Dmaven.test.skip=true -Djavax.net.ssl.trustStore=${CACERTS} -Dsonar.dependencyCheck.reportPath=target/dependency-check-report.xml --settings settings-ci.xml
5051
only:
5152
- master
52-
except:
53-
- tags
54-
53+
- develop

‎pom.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<artifactId>c2mon-daq-hostmetrics</artifactId>
1212
<version>0.0.6-SNAPSHOT</version>
1313
<packaging>jar</packaging>
14-
<description>A simple, exemplary C1MON DAQ module for publishing metrics about the current host using the OSHI library</description>
14+
<description>A simple, exemplary C2MON DAQ module for publishing metrics about the current host using the OSHI library</description>
1515

1616
<scm>
1717
<url>https://gitlab.cern.ch/c2mon/c2mon-daq-hostmetrics</url>
@@ -52,14 +52,20 @@
5252
<plugins>
5353
<!-- Activate plugin configurations to build a tarball and a docker image -->
5454
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-compiler-plugin</artifactId>
57+
</plugin>
58+
<plugin>
59+
<groupId>org.apache.maven.plugins</groupId>
5560
<artifactId>maven-dependency-plugin</artifactId>
5661
</plugin>
5762
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
5864
<artifactId>maven-assembly-plugin</artifactId>
5965
</plugin>
6066
<plugin>
67+
<groupId>com.google.cloud.tools</groupId>
6168
<artifactId>jib-maven-plugin</artifactId>
62-
<version>2.5.2</version>
6369
</plugin>
6470
<plugin>
6571
<groupId>org.codehaus.mojo</groupId>

0 commit comments

Comments
 (0)
Please sign in to comment.