Skip to content

Commit 213e6ea

Browse files
lor6lor6
authored
Merge pull request #8927 from kwoyke/JAVA-1088
JAVA-1088: Move java-generating-barcodes-qr-codes into spring-boot-li…
2 parents c0f61d0 + 1022c70 commit 213e6ea

9 files changed

Lines changed: 53 additions & 41 deletions

File tree

‎libraries-3/pom.xml‎

Lines changed: 15 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
<parent>
1010
<groupId>com.baeldung</groupId>
11-
<artifactId>parent-boot-2</artifactId>
12-
<version>0.0.1-SNAPSHOT</version>
13-
<relativePath>../parent-boot-2</relativePath>
11+
<artifactId>parent-modules</artifactId>
12+
<version>1.0.0-SNAPSHOT</version>
1413
</parent>
1514

1615
<dependencies>
@@ -24,39 +23,6 @@
2423
<artifactId>lombok</artifactId>
2524
<version>${lombok.version}</version>
2625
</dependency>
27-
<dependency>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter-web</artifactId>
30-
</dependency>
31-
32-
<dependency>
33-
<groupId>net.sourceforge.barbecue</groupId>
34-
<artifactId>barbecue</artifactId>
35-
<version>${barbecue.version}</version>
36-
</dependency>
37-
38-
<dependency>
39-
<groupId>net.sf.barcode4j</groupId>
40-
<artifactId>barcode4j</artifactId>
41-
<version>${barcode4j.version}</version>
42-
</dependency>
43-
44-
<dependency>
45-
<groupId>com.google.zxing</groupId>
46-
<artifactId>core</artifactId>
47-
<version>${zxing.version}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.google.zxing</groupId>
51-
<artifactId>javase</artifactId>
52-
<version>${zxing.version}</version>
53-
</dependency>
54-
55-
<dependency>
56-
<groupId>com.github.kenglxn.qrgen</groupId>
57-
<artifactId>javase</artifactId>
58-
<version>${qrgen.version}</version>
59-
</dependency>
6026
<dependency>
6127
<groupId>com.github.rvesse</groupId>
6228
<artifactId>airline</artifactId>
@@ -89,6 +55,16 @@
8955
<artifactId>takes</artifactId>
9056
<version>${takes.version}</version>
9157
</dependency>
58+
<dependency>
59+
<groupId>org.apache.httpcomponents</groupId>
60+
<artifactId>httpcore</artifactId>
61+
<version>${httpcore.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.apache.httpcomponents</groupId>
65+
<artifactId>httpclient</artifactId>
66+
<version>${httpclient.version}</version>
67+
</dependency>
9268
<dependency>
9369
<groupId>org.apache.velocity</groupId>
9470
<artifactId>velocity-engine-core</artifactId>
@@ -119,7 +95,7 @@
11995
<url>https://jitpack.io</url>
12096
</repository>
12197
</repositories>
122-
98+
12399
<build>
124100
<finalName>libraries-3</finalName>
125101
<plugins>
@@ -239,10 +215,6 @@
239215
<properties>
240216
<jcommander.version>1.78</jcommander.version>
241217
<lombok.version>1.18.6</lombok.version>
242-
<barbecue.version>1.5-beta1</barbecue.version>
243-
<barcode4j.version>2.1</barcode4j.version>
244-
<zxing.version>3.3.0</zxing.version>
245-
<qrgen.version>2.6.0</qrgen.version>
246218

247219
<cactoos.version>0.43</cactoos.version>
248220
<airline.version>2.7.2</airline.version>
@@ -254,6 +226,8 @@
254226
<aspectjweaver.version>1.9.2</aspectjweaver.version>
255227

256228
<takes.version>1.19</takes.version>
229+
<httpcore.version>4.4.13</httpcore.version>
230+
<httpclient.version>4.5.12</httpclient.version>
257231
<velocity-engine-core.version>2.2</velocity-engine-core.version>
258232
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
259233
</properties>

‎spring-boot-modules/spring-boot-libraries/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
99

1010
- [Guide to ShedLock with Spring](https://www.baeldung.com/shedlock-spring)
1111
- [A Guide to the Problem Spring Web Library](https://www.baeldung.com/problem-spring-web)
12+
- [Generating Barcodes and QR Codes in Java](https://www.baeldung.com/java-generating-barcodes-qr-codes)

‎spring-boot-modules/spring-boot-libraries/pom.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,41 @@
5353
<version>${shedlock.version}</version>
5454
</dependency>
5555

56+
<!-- Barcodes -->
57+
<dependency>
58+
<groupId>net.sourceforge.barbecue</groupId>
59+
<artifactId>barbecue</artifactId>
60+
<version>${barbecue.version}</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>net.sf.barcode4j</groupId>
64+
<artifactId>barcode4j</artifactId>
65+
<version>${barcode4j.version}</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>com.github.kenglxn.qrgen</groupId>
69+
<artifactId>javase</artifactId>
70+
<version>${qrgen.version}</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>com.google.zxing</groupId>
74+
<artifactId>core</artifactId>
75+
<version>${zxing.version}</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>com.google.zxing</groupId>
79+
<artifactId>javase</artifactId>
80+
<version>${zxing.version}</version>
81+
</dependency>
5682
</dependencies>
5783

84+
<repositories>
85+
<repository>
86+
<id>jitpack.io</id>
87+
<url>https://jitpack.io</url>
88+
</repository>
89+
</repositories>
90+
5891
<build>
5992
<finalName>spring-boot-libraries</finalName>
6093
<resources>
@@ -153,6 +186,10 @@
153186
<modelmapper.version>2.3.2</modelmapper.version>
154187
<problem-spring-web.version>0.23.0</problem-spring-web.version>
155188
<shedlock.version>2.1.0</shedlock.version>
189+
<barbecue.version>1.5-beta1</barbecue.version>
190+
<barcode4j.version>2.1</barcode4j.version>
191+
<qrgen.version>2.6.0</qrgen.version>
192+
<zxing.version>3.3.0</zxing.version>
156193
</properties>
157194

158195
</project>

libraries-3/src/main/java/com/baeldung/barcodes/BarcodesController.java renamed to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/barcodes/BarcodesController.java

File renamed without changes.

libraries-3/src/main/java/com/baeldung/barcodes/SpringBootApp.java renamed to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/barcodes/SpringBootApp.java

File renamed without changes.

libraries-3/src/main/java/com/baeldung/barcodes/generators/BarbecueBarcodeGenerator.java renamed to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/barcodes/generators/BarbecueBarcodeGenerator.java

File renamed without changes.

libraries-3/src/main/java/com/baeldung/barcodes/generators/Barcode4jBarcodeGenerator.java renamed to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/barcodes/generators/Barcode4jBarcodeGenerator.java

File renamed without changes.

libraries-3/src/main/java/com/baeldung/barcodes/generators/QRGenBarcodeGenerator.java renamed to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/barcodes/generators/QRGenBarcodeGenerator.java

File renamed without changes.

libraries-3/src/main/java/com/baeldung/barcodes/generators/ZxingBarcodeGenerator.java renamed to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/barcodes/generators/ZxingBarcodeGenerator.java

File renamed without changes.

0 commit comments

Comments
 (0)