Skip to content

Commit 770c8ee

Browse files
osopromadzeosopromadze
authored
Merge branch 'master' into feature/use-lombok-library
2 parents ece7c29 + fac9d28 commit 770c8ee

File tree

2 files changed

+107
-132
lines changed

2 files changed

+107
-132
lines changed

‎.github/workflows/greetings.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Greetings
22

3-
on: [ pull_request, issues ]
3+
on: [pull_request_target, issues]
44

55
jobs:
66
greeting:

‎pom.xml‎

Lines changed: 106 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -46,136 +46,111 @@
4646
<groupId>org.springframework.boot</groupId>
4747
<artifactId>spring-boot-starter-aop</artifactId>
4848
</dependency>
49-
50-
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-test -->
51-
<dependency>
52-
<groupId>org.springframework.boot</groupId>
53-
<artifactId>spring-boot-starter-test</artifactId>
54-
<scope>test</scope>
55-
</dependency>
56-
57-
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
58-
<dependency>
59-
<groupId>org.mockito</groupId>
60-
<artifactId>mockito-all</artifactId>
61-
<version>2.0.2-beta</version>
62-
<scope>test</scope>
63-
</dependency>
64-
65-
<!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-test -->
66-
<dependency>
67-
<groupId>org.springframework.security</groupId>
68-
<artifactId>spring-security-test</artifactId>
69-
<scope>test</scope>
70-
</dependency>
71-
72-
73-
<!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest-library -->
74-
<dependency>
75-
<groupId>org.hamcrest</groupId>
76-
<artifactId>hamcrest-library</artifactId>
77-
<scope>test</scope>
78-
</dependency>
79-
80-
<!-- https://mvnrepository.com/artifact/org.modelmapper/modelmapper -->
81-
<dependency>
82-
<groupId>org.modelmapper</groupId>
83-
<artifactId>modelmapper</artifactId>
84-
<version>2.3.5</version>
85-
</dependency>
86-
87-
88-
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
89-
<dependency>
90-
<groupId>org.projectlombok</groupId>
91-
<artifactId>lombok</artifactId>
92-
<version>1.18.12</version>
93-
<scope>provided</scope>
94-
</dependency>
95-
96-
97-
<dependency>
98-
<groupId>org.springframework.boot</groupId>
99-
<artifactId>spring-boot-devtools</artifactId>
100-
</dependency>
101-
102-
<dependency>
103-
<groupId>org.springframework.boot</groupId>
104-
<artifactId>spring-boot-starter-data-jpa</artifactId>
105-
</dependency>
106-
107-
108-
<dependency>
109-
<groupId>org.springframework.boot</groupId>
110-
<artifactId>spring-boot-starter-test</artifactId>
111-
<scope>test</scope>
112-
</dependency>
113-
114-
<dependency>
115-
<groupId>org.springframework.boot</groupId>
116-
<artifactId>spring-boot-starter-security</artifactId>
117-
</dependency>
118-
119-
<dependency>
120-
<groupId>org.springframework.security</groupId>
121-
<artifactId>spring-security-jwt</artifactId>
122-
<version>1.0.9.RELEASE</version>
123-
</dependency>
124-
125-
<dependency>
126-
<groupId>org.springframework.security.oauth</groupId>
127-
<artifactId>spring-security-oauth2</artifactId>
128-
<version>2.3.4.RELEASE</version>
129-
</dependency>
130-
131-
<dependency>
132-
<groupId>io.jsonwebtoken</groupId>
133-
<artifactId>jjwt</artifactId>
134-
<version>0.9.1</version>
135-
</dependency>
136-
137-
<dependency>
138-
<groupId>javax.xml.bind</groupId>
139-
<artifactId>jaxb-api</artifactId>
140-
</dependency>
141-
142-
<dependency>
143-
<groupId>com.fasterxml.jackson.datatype</groupId>
144-
<artifactId>jackson-datatype-jsr310</artifactId>
145-
</dependency>
146-
147-
<dependency>
148-
<groupId>org.apache.commons</groupId>
149-
<artifactId>commons-lang3</artifactId>
150-
</dependency>
151-
152-
<dependency>
153-
<groupId>org.modelmapper</groupId>
154-
<artifactId>modelmapper</artifactId>
155-
<version>2.3.1</version>
156-
</dependency>
157-
158-
159-
</dependencies>
160-
161-
<build>
162-
<plugins>
163-
<plugin>
164-
<groupId>org.springframework.boot</groupId>
165-
<artifactId>spring-boot-maven-plugin</artifactId>
166-
<configuration>
167-
<mainClass>com.sopromadze.blogapi.BlogApiApplication</mainClass>
168-
</configuration>
169-
<executions>
170-
<execution>
171-
<goals>
172-
<goal>repackage</goal>
173-
</goals>
174-
</execution>
175-
</executions>
176-
</plugin>
177-
</plugins>
178-
</build>
179-
49+
50+
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-test -->
51+
<dependency>
52+
<groupId>org.springframework.boot</groupId>
53+
<artifactId>spring-boot-starter-test</artifactId>
54+
<scope>test</scope>
55+
</dependency>
56+
57+
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
58+
<dependency>
59+
<groupId>org.mockito</groupId>
60+
<artifactId>mockito-all</artifactId>
61+
<version>2.0.2-beta</version>
62+
<scope>test</scope>
63+
</dependency>
64+
65+
<!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-test -->
66+
<dependency>
67+
<groupId>org.springframework.security</groupId>
68+
<artifactId>spring-security-test</artifactId>
69+
<scope>test</scope>
70+
</dependency>
71+
72+
73+
<!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest-library -->
74+
<dependency>
75+
<groupId>org.hamcrest</groupId>
76+
<artifactId>hamcrest-library</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
80+
<!-- https://mvnrepository.com/artifact/org.modelmapper/modelmapper -->
81+
<dependency>
82+
<groupId>org.modelmapper</groupId>
83+
<artifactId>modelmapper</artifactId>
84+
<version>2.3.5</version>
85+
</dependency>
86+
87+
<dependency>
88+
<groupId>org.springframework.boot</groupId>
89+
<artifactId>spring-boot-devtools</artifactId>
90+
</dependency>
91+
92+
<dependency>
93+
<groupId>org.springframework.boot</groupId>
94+
<artifactId>spring-boot-starter-data-jpa</artifactId>
95+
</dependency>
96+
97+
<dependency>
98+
<groupId>org.springframework.boot</groupId>
99+
<artifactId>spring-boot-starter-security</artifactId>
100+
</dependency>
101+
102+
<dependency>
103+
<groupId>org.springframework.security</groupId>
104+
<artifactId>spring-security-jwt</artifactId>
105+
<version>1.0.9.RELEASE</version>
106+
</dependency>
107+
108+
<dependency>
109+
<groupId>org.springframework.security.oauth</groupId>
110+
<artifactId>spring-security-oauth2</artifactId>
111+
<version>2.3.4.RELEASE</version>
112+
</dependency>
113+
114+
<dependency>
115+
<groupId>io.jsonwebtoken</groupId>
116+
<artifactId>jjwt</artifactId>
117+
<version>0.9.1</version>
118+
</dependency>
119+
120+
<dependency>
121+
<groupId>javax.xml.bind</groupId>
122+
<artifactId>jaxb-api</artifactId>
123+
</dependency>
124+
125+
<dependency>
126+
<groupId>com.fasterxml.jackson.datatype</groupId>
127+
<artifactId>jackson-datatype-jsr310</artifactId>
128+
</dependency>
129+
130+
<dependency>
131+
<groupId>org.apache.commons</groupId>
132+
<artifactId>commons-lang3</artifactId>
133+
</dependency>
134+
135+
</dependencies>
136+
137+
<build>
138+
<plugins>
139+
<plugin>
140+
<groupId>org.springframework.boot</groupId>
141+
<artifactId>spring-boot-maven-plugin</artifactId>
142+
<configuration>
143+
<mainClass>com.sopromadze.blogapi.BlogApiApplication</mainClass>
144+
</configuration>
145+
<executions>
146+
<execution>
147+
<goals>
148+
<goal>repackage</goal>
149+
</goals>
150+
</execution>
151+
</executions>
152+
</plugin>
153+
</plugins>
154+
</build>
180155

181156
</project>

0 commit comments

Comments
 (0)