Skip to content

Commit 885f9d7

Browse files
mcanoymcanoy
committed
Merge branch 'master' of github.com:rht-labs/lodestar-git-api into commits
2 parents cd7e109 + c32af08 commit 885f9d7

File tree

3 files changed

+194
-167
lines changed

3 files changed

+194
-167
lines changed

‎.github/workflows/ci-cd.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ jobs:
1515
uses: actions/setup-java@v1
1616
with:
1717
java-version: 13.0.1
18-
- name: Build with Maven & Quarkus
19-
run: mvn test -q
18+
- name: SonarCloud Static Analysis
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
22+
run: mvn verify sonar:sonar -Dsonar.login=${{ secrets.SONAR_TOKEN }} -q
2023
- name: Find and Replace Commit
2124
uses: jacobtomlinson/[email protected]
2225
with:

‎pom.xml‎

Lines changed: 188 additions & 163 deletions
Original file line numberDiff line numberDiff line change
@@ -1,166 +1,191 @@
11
<?xml version="1.0"?>
22
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6-
<modelVersion>4.0.0</modelVersion>
7-
<groupId>com.redhat.labs</groupId>
8-
<artifactId>lodestar-git-api</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
10-
<properties>
11-
<compiler-plugin.version>3.8.1</compiler-plugin.version>
12-
<maven.compiler.parameters>true</maven.compiler.parameters>
13-
<maven.compiler.source>1.8</maven.compiler.source>
14-
<maven.compiler.target>1.8</maven.compiler.target>
15-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17-
<quarkus-plugin.version>1.3.0.Final</quarkus-plugin.version>
18-
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
19-
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
20-
<quarkus.platform.version>1.3.0.Final</quarkus.platform.version>
21-
<surefire-plugin.version>2.22.1</surefire-plugin.version>
22-
<lombok.version>1.18.12</lombok.version>
23-
</properties>
24-
<dependencyManagement>
25-
<dependencies>
26-
<dependency>
27-
<groupId>${quarkus.platform.group-id}</groupId>
28-
<artifactId>${quarkus.platform.artifact-id}</artifactId>
29-
<version>${quarkus.platform.version}</version>
30-
<type>pom</type>
31-
<scope>import</scope>
32-
</dependency>
33-
</dependencies>
34-
</dependencyManagement>
35-
<dependencies>
36-
<!-- Web -->
37-
<dependency>
38-
<groupId>io.quarkus</groupId>
39-
<artifactId>quarkus-resteasy</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>io.quarkus</groupId>
43-
<artifactId>quarkus-hibernate-validator</artifactId>
44-
</dependency>
45-
<dependency>
46-
<groupId>io.quarkus</groupId>
47-
<artifactId>quarkus-resteasy-jsonb</artifactId>
48-
</dependency>
49-
<!-- REST Client -->
50-
<dependency>
51-
<groupId>io.quarkus</groupId>
52-
<artifactId>quarkus-rest-client</artifactId>
53-
</dependency>
54-
<!-- Templates -->
55-
<dependency>
56-
<groupId>io.quarkus</groupId>
57-
<artifactId>quarkus-resteasy-qute</artifactId>
58-
</dependency>
59-
<!-- Events -->
60-
<dependency>
61-
<groupId>io.quarkus</groupId>
62-
<artifactId>quarkus-vertx</artifactId>
63-
</dependency>
64-
<!-- Health Checks -->
65-
<dependency>
66-
<groupId>io.quarkus</groupId>
67-
<artifactId>quarkus-smallrye-health</artifactId>
68-
</dependency>
69-
<!-- OpenApi/Swagger -->
70-
<dependency>
71-
<groupId>io.quarkus</groupId>
72-
<artifactId>quarkus-smallrye-openapi</artifactId>
73-
</dependency>
74-
<!-- Metrics -->
75-
<dependency>
76-
<groupId>io.quarkus</groupId>
77-
<artifactId>quarkus-smallrye-metrics</artifactId>
78-
</dependency>
79-
<!-- Other -->
80-
<dependency>
81-
<groupId>org.projectlombok</groupId>
82-
<artifactId>lombok</artifactId>
83-
<version>${lombok.version}</version>
84-
<scope>provided</scope>
85-
</dependency>
86-
<!-- Test -->
87-
<dependency>
88-
<groupId>io.quarkus</groupId>
89-
<artifactId>quarkus-junit5</artifactId>
90-
<scope>test</scope>
91-
</dependency>
92-
<dependency>
93-
<groupId>io.rest-assured</groupId>
94-
<artifactId>rest-assured</artifactId>
95-
<scope>test</scope>
96-
</dependency>
97-
<dependency>
98-
<groupId>io.vertx</groupId>
99-
<artifactId>vertx-junit5</artifactId>
100-
<scope>test</scope>
101-
</dependency>
102-
</dependencies>
103-
<build>
104-
<plugins>
105-
<plugin>
106-
<groupId>io.quarkus</groupId>
107-
<artifactId>quarkus-maven-plugin</artifactId>
108-
<version>${quarkus-plugin.version}</version>
109-
<executions>
110-
<execution>
111-
<goals>
112-
<goal>build</goal>
113-
</goals>
114-
</execution>
115-
</executions>
116-
</plugin>
117-
<plugin>
118-
<artifactId>maven-compiler-plugin</artifactId>
119-
<version>${compiler-plugin.version}</version>
120-
</plugin>
121-
<plugin>
122-
<artifactId>maven-surefire-plugin</artifactId>
123-
<version>${surefire-plugin.version}</version>
124-
<configuration>
125-
<systemProperties>
126-
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
127-
</systemProperties>
128-
</configuration>
129-
</plugin>
130-
</plugins>
131-
</build>
132-
<profiles>
133-
<profile>
134-
<id>native</id>
135-
<activation>
136-
<property>
137-
<name>native</name>
138-
</property>
139-
</activation>
140-
<build>
141-
<plugins>
142-
<plugin>
143-
<artifactId>maven-failsafe-plugin</artifactId>
144-
<version>${surefire-plugin.version}</version>
145-
<executions>
146-
<execution>
147-
<goals>
148-
<goal>integration-test</goal>
149-
<goal>verify</goal>
150-
</goals>
151-
<configuration>
152-
<systemProperties>
153-
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
154-
</systemProperties>
155-
</configuration>
156-
</execution>
157-
</executions>
158-
</plugin>
159-
</plugins>
160-
</build>
161-
<properties>
162-
<quarkus.package.type>native</quarkus.package.type>
163-
</properties>
164-
</profile>
165-
</profiles>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6+
<modelVersion>4.0.0</modelVersion>
7+
<groupId>com.redhat.labs</groupId>
8+
<artifactId>lodestar-git-api</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
<properties>
11+
<compiler-plugin.version>3.8.1</compiler-plugin.version>
12+
<maven.compiler.parameters>true</maven.compiler.parameters>
13+
<maven.compiler.source>1.8</maven.compiler.source>
14+
<maven.compiler.target>1.8</maven.compiler.target>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17+
<quarkus-plugin.version>1.3.0.Final</quarkus-plugin.version>
18+
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
19+
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
20+
<quarkus.platform.version>1.3.0.Final</quarkus.platform.version>
21+
<surefire-plugin.version>2.22.1</surefire-plugin.version>
22+
<lombok.version>1.18.12</lombok.version>
23+
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
24+
<sonar.project.key>rht-labs_lodestar-git-api</sonar.project.key>
25+
<sonar.organization>rht-labs</sonar.organization>
26+
<sonar.jacoco.reportPath>target/jacoco.exec</sonar.jacoco.reportPath>
27+
</properties>
28+
<dependencyManagement>
29+
<dependencies>
30+
<dependency>
31+
<groupId>${quarkus.platform.group-id}</groupId>
32+
<artifactId>${quarkus.platform.artifact-id}</artifactId>
33+
<version>${quarkus.platform.version}</version>
34+
<type>pom</type>
35+
<scope>import</scope>
36+
</dependency>
37+
</dependencies>
38+
</dependencyManagement>
39+
<dependencies>
40+
<!-- Web -->
41+
<dependency>
42+
<groupId>io.quarkus</groupId>
43+
<artifactId>quarkus-resteasy</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>io.quarkus</groupId>
47+
<artifactId>quarkus-hibernate-validator</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>io.quarkus</groupId>
51+
<artifactId>quarkus-resteasy-jsonb</artifactId>
52+
</dependency>
53+
<!-- REST Client -->
54+
<dependency>
55+
<groupId>io.quarkus</groupId>
56+
<artifactId>quarkus-rest-client</artifactId>
57+
</dependency>
58+
<!-- Templates -->
59+
<dependency>
60+
<groupId>io.quarkus</groupId>
61+
<artifactId>quarkus-resteasy-qute</artifactId>
62+
</dependency>
63+
<!-- Events -->
64+
<dependency>
65+
<groupId>io.quarkus</groupId>
66+
<artifactId>quarkus-vertx</artifactId>
67+
</dependency>
68+
<!-- Health Checks -->
69+
<dependency>
70+
<groupId>io.quarkus</groupId>
71+
<artifactId>quarkus-smallrye-health</artifactId>
72+
</dependency>
73+
<!-- OpenApi/Swagger -->
74+
<dependency>
75+
<groupId>io.quarkus</groupId>
76+
<artifactId>quarkus-smallrye-openapi</artifactId>
77+
</dependency>
78+
<!-- Metrics -->
79+
<dependency>
80+
<groupId>io.quarkus</groupId>
81+
<artifactId>quarkus-smallrye-metrics</artifactId>
82+
</dependency>
83+
<!-- Other -->
84+
<dependency>
85+
<groupId>org.projectlombok</groupId>
86+
<artifactId>lombok</artifactId>
87+
<version>${lombok.version}</version>
88+
<scope>provided</scope>
89+
</dependency>
90+
<!-- Test -->
91+
<dependency>
92+
<groupId>io.quarkus</groupId>
93+
<artifactId>quarkus-junit5</artifactId>
94+
<scope>test</scope>
95+
</dependency>
96+
<dependency>
97+
<groupId>io.rest-assured</groupId>
98+
<artifactId>rest-assured</artifactId>
99+
<scope>test</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>io.vertx</groupId>
103+
<artifactId>vertx-junit5</artifactId>
104+
<scope>test</scope>
105+
</dependency>
106+
</dependencies>
107+
<build>
108+
<plugins>
109+
<plugin>
110+
<groupId>io.quarkus</groupId>
111+
<artifactId>quarkus-maven-plugin</artifactId>
112+
<version>${quarkus-plugin.version}</version>
113+
<executions>
114+
<execution>
115+
<goals>
116+
<goal>build</goal>
117+
</goals>
118+
</execution>
119+
</executions>
120+
</plugin>
121+
<plugin>
122+
<artifactId>maven-compiler-plugin</artifactId>
123+
<version>${compiler-plugin.version}</version>
124+
</plugin>
125+
<plugin>
126+
<artifactId>maven-surefire-plugin</artifactId>
127+
<version>${surefire-plugin.version}</version>
128+
<configuration>
129+
<systemProperties>
130+
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
131+
</systemProperties>
132+
</configuration>
133+
</plugin>
134+
<plugin>
135+
<groupId>org.jacoco</groupId>
136+
<artifactId>jacoco-maven-plugin</artifactId>
137+
<version>0.8.5</version>
138+
<executions>
139+
<execution>
140+
<id>jacoco-initialize</id>
141+
<goals>
142+
<goal>prepare-agent</goal>
143+
</goals>
144+
<phase>test-compile</phase>
145+
</execution>
146+
<execution>
147+
<id>jacoco-site</id>
148+
<phase>verify</phase>
149+
<goals>
150+
<goal>report</goal>
151+
</goals>
152+
</execution>
153+
</executions>
154+
</plugin>
155+
</plugins>
156+
</build>
157+
<profiles>
158+
<profile>
159+
<id>native</id>
160+
<activation>
161+
<property>
162+
<name>native</name>
163+
</property>
164+
</activation>
165+
<build>
166+
<plugins>
167+
<plugin>
168+
<artifactId>maven-failsafe-plugin</artifactId>
169+
<version>${surefire-plugin.version}</version>
170+
<executions>
171+
<execution>
172+
<goals>
173+
<goal>integration-test</goal>
174+
<goal>verify</goal>
175+
</goals>
176+
<configuration>
177+
<systemProperties>
178+
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
179+
</systemProperties>
180+
</configuration>
181+
</execution>
182+
</executions>
183+
</plugin>
184+
</plugins>
185+
</build>
186+
<properties>
187+
<quarkus.package.type>native</quarkus.package.type>
188+
</properties>
189+
</profile>
190+
</profiles>
166191
</project>

‎src/main/java/com/redhat/labs/omp/service/EngagementService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ public Project createEngagement(Engagement engagement, String author, String aut
106106
List<HookConfig> hookConfigs = configService.getHookConfig();
107107
hookConfigs.stream().forEach(hookC -> {
108108
Hook hook = Hook.builder().projectId(engagement.getProjectId()).pushEvents(true)
109-
.url(hookC.getBaseUrl() + engagement.getCustomerName() + "-" + engagement.getProjectName())
110-
.token(hookC.getToken()).build();
109+
.url(hookC.getBaseUrl()).token(hookC.getToken()).build();
111110
if(project.isFirst()) { //No need to check for existing hooks first time
112111
hookService.createProjectHook(engagement.getProjectId(), hook);
113112
} else {

0 commit comments

Comments
 (0)