Skip to content

Commit 9c03b45

Browse files
Doha2012pivovarit
Doha2012
authored and
pivovarit
committed
move java8 code (eugenp#2535)
* fix spring config * fix spring config * fix spring config * minor fix * fix spring-boot module * fix pom * upgrade jackson * minor fix * java concurrency * cleanup * fix conflict * java 8 * clean up * add core-java-8 to main pom
1 parent 2aeef70 commit 9c03b45

94 files changed

Lines changed: 358 additions & 34 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core-java-8/.gitignore‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
*.class
2+
3+
0.*
4+
5+
#folders#
6+
/target
7+
/neoDb*
8+
/data
9+
/src/main/webapp/WEB-INF/classes
10+
*/META-INF/*
11+
.resourceCache
12+
13+
# Packaged files #
14+
*.jar
15+
*.war
16+
*.ear
17+
18+
# Files generated by integration tests
19+
*.txt
20+
backup-pom.xml
21+
/bin/
22+
/temp
23+
24+
#IntelliJ specific
25+
.idea/
26+
*.iml

‎core-java-8/README.md‎

Lines changed: 32 additions & 0 deletions

‎core-java-8/pom.xml‎

Lines changed: 258 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,258 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.baeldung</groupId>
5+
<artifactId>core-java-8</artifactId>
6+
<version>0.1.0-SNAPSHOT</version>
7+
<packaging>jar</packaging>
8+
9+
<name>core-java-8</name>
10+
11+
12+
<parent>
13+
<groupId>com.baeldung</groupId>
14+
<artifactId>parent-modules</artifactId>
15+
<version>1.0.0-SNAPSHOT</version>
16+
</parent>
17+
18+
<dependencies>
19+
20+
<!-- utils -->
21+
<dependency>
22+
<groupId>com.google.guava</groupId>
23+
<artifactId>guava</artifactId>
24+
<version>${guava.version}</version>
25+
</dependency>
26+
27+
<dependency>
28+
<groupId>org.apache.commons</groupId>
29+
<artifactId>commons-collections4</artifactId>
30+
<version>${commons-collections4.version}</version>
31+
</dependency>
32+
33+
<dependency>
34+
<groupId>commons-io</groupId>
35+
<artifactId>commons-io</artifactId>
36+
<version>${commons-io.version}</version>
37+
</dependency>
38+
39+
<dependency>
40+
<groupId>org.apache.commons</groupId>
41+
<artifactId>commons-lang3</artifactId>
42+
<version>${commons-lang3.version}</version>
43+
</dependency>
44+
45+
<dependency>
46+
<groupId>org.apache.commons</groupId>
47+
<artifactId>commons-math3</artifactId>
48+
<version>${commons-math3.version}</version>
49+
</dependency>
50+
51+
<dependency>
52+
<groupId>log4j</groupId>
53+
<artifactId>log4j</artifactId>
54+
<version>1.2.17</version>
55+
</dependency>
56+
57+
<dependency>
58+
<groupId>commons-codec</groupId>
59+
<artifactId>commons-codec</artifactId>
60+
<version>${commons-codec.version}</version>
61+
</dependency>
62+
63+
<dependency>
64+
<groupId>org.projectlombok</groupId>
65+
<artifactId>lombok</artifactId>
66+
<version>${lombok.version}</version>
67+
<scope>provided</scope>
68+
</dependency>
69+
70+
<!-- test scoped -->
71+
72+
<dependency>
73+
<groupId>org.assertj</groupId>
74+
<artifactId>assertj-core</artifactId>
75+
<version>${assertj.version}</version>
76+
<scope>test</scope>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>com.jayway.awaitility</groupId>
81+
<artifactId>awaitility</artifactId>
82+
<version>${avaitility.version}</version>
83+
<scope>test</scope>
84+
</dependency>
85+
86+
</dependencies>
87+
88+
<build>
89+
<finalName>core-java-8</finalName>
90+
<resources>
91+
<resource>
92+
<directory>src/main/resources</directory>
93+
<filtering>true</filtering>
94+
</resource>
95+
</resources>
96+
97+
<plugins>
98+
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100+
<artifactId>maven-dependency-plugin</artifactId>
101+
<executions>
102+
<execution>
103+
<id>copy-dependencies</id>
104+
<phase>prepare-package</phase>
105+
<goals>
106+
<goal>copy-dependencies</goal>
107+
</goals>
108+
<configuration>
109+
<outputDirectory>${project.build.directory}/libs</outputDirectory>
110+
</configuration>
111+
</execution>
112+
</executions>
113+
</plugin>
114+
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-jar-plugin</artifactId>
118+
<configuration>
119+
<archive>
120+
<manifest>
121+
<addClasspath>true</addClasspath>
122+
<classpathPrefix>libs/</classpathPrefix>
123+
<mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
124+
</manifest>
125+
</archive>
126+
</configuration>
127+
</plugin>
128+
<plugin>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-assembly-plugin</artifactId>
131+
<executions>
132+
<execution>
133+
<phase>package</phase>
134+
<goals>
135+
<goal>single</goal>
136+
</goals>
137+
<configuration>
138+
<archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
139+
<archive>
140+
<manifest>
141+
<mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
142+
</manifest>
143+
</archive>
144+
<descriptorRefs>
145+
<descriptorRef>jar-with-dependencies</descriptorRef>
146+
</descriptorRefs>
147+
</configuration>
148+
</execution>
149+
</executions>
150+
</plugin>
151+
<plugin>
152+
<groupId>org.apache.maven.plugins</groupId>
153+
<artifactId>maven-shade-plugin</artifactId>
154+
<executions>
155+
<execution>
156+
<goals>
157+
<goal>shade</goal>
158+
</goals>
159+
<configuration>
160+
<shadedArtifactAttached>true</shadedArtifactAttached>
161+
<transformers>
162+
<transformer
163+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
164+
<mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
165+
</transformer>
166+
</transformers>
167+
</configuration>
168+
</execution>
169+
</executions>
170+
</plugin>
171+
<plugin>
172+
<groupId>com.jolira</groupId>
173+
<artifactId>onejar-maven-plugin</artifactId>
174+
<executions>
175+
<execution>
176+
<configuration>
177+
<mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
178+
<attachToBuild>true</attachToBuild>
179+
<filename>${project.build.finalName}-onejar.${project.packaging}</filename>
180+
</configuration>
181+
<goals>
182+
<goal>one-jar</goal>
183+
</goals>
184+
</execution>
185+
</executions>
186+
</plugin>
187+
<plugin>
188+
<groupId>org.springframework.boot</groupId>
189+
<artifactId>spring-boot-maven-plugin</artifactId>
190+
<executions>
191+
<execution>
192+
<goals>
193+
<goal>repackage</goal>
194+
</goals>
195+
<configuration>
196+
<classifier>spring-boot</classifier>
197+
<mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
198+
</configuration>
199+
</execution>
200+
</executions>
201+
</plugin>
202+
</plugins>
203+
204+
</build>
205+
206+
<profiles>
207+
<profile>
208+
<id>integration</id>
209+
<build>
210+
<plugins>
211+
<plugin>
212+
<groupId>org.apache.maven.plugins</groupId>
213+
<artifactId>maven-surefire-plugin</artifactId>
214+
<executions>
215+
<execution>
216+
<phase>integration-test</phase>
217+
<goals>
218+
<goal>test</goal>
219+
</goals>
220+
<configuration>
221+
<excludes>
222+
<exclude>**/*ManualTest.java</exclude>
223+
</excludes>
224+
<includes>
225+
<include>**/*IntegrationTest.java</include>
226+
</includes>
227+
</configuration>
228+
</execution>
229+
</executions>
230+
<configuration>
231+
<systemPropertyVariables>
232+
<test.mime>json</test.mime>
233+
</systemPropertyVariables>
234+
</configuration>
235+
</plugin>
236+
</plugins>
237+
</build>
238+
</profile>
239+
</profiles>
240+
241+
<properties>
242+
243+
<!-- util -->
244+
<guava.version>21.0</guava.version>
245+
<commons-lang3.version>3.5</commons-lang3.version>
246+
<commons-math3.version>3.6.1</commons-math3.version>
247+
<commons-io.version>2.5</commons-io.version>
248+
<commons-collections4.version>4.1</commons-collections4.version>
249+
<collections-generic.version>4.01</collections-generic.version>
250+
<commons-codec.version>1.10</commons-codec.version>
251+
<lombok.version>1.16.12</lombok.version>
252+
253+
<!-- testing -->
254+
<assertj.version>3.6.1</assertj.version>
255+
<avaitility.version>1.7.0</avaitility.version>
256+
257+
</properties>
258+
</project>

core-java/src/main/java/com/baeldung/Adder.java renamed to core-java-8/src/main/java/com/baeldung/Adder.java

File renamed without changes.

core-java/src/main/java/com/baeldung/AdderImpl.java renamed to core-java-8/src/main/java/com/baeldung/AdderImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.baeldung;
22

3+
34
import java.util.function.Consumer;
45
import java.util.function.Function;
56

core-java/src/main/java/com/baeldung/Bar.java renamed to core-java-8/src/main/java/com/baeldung/Bar.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.baeldung;
22

3+
34
@FunctionalInterface
45
public interface Bar {
56

core-java/src/main/java/com/baeldung/Baz.java renamed to core-java-8/src/main/java/com/baeldung/Baz.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.baeldung;
22

3+
34
@FunctionalInterface
45
public interface Baz {
56

core-java/src/main/java/com/baeldung/Foo.java renamed to core-java-8/src/main/java/com/baeldung/Foo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.baeldung;
22

3+
34
@FunctionalInterface
45
public interface Foo {
56

core-java/src/main/java/com/baeldung/FooExtended.java renamed to core-java-8/src/main/java/com/baeldung/FooExtended.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.baeldung;
22

3+
34
@FunctionalInterface
45
public interface FooExtended extends Baz, Bar {
56

core-java/src/main/java/com/baeldung/UseFoo.java renamed to core-java-8/src/main/java/com/baeldung/UseFoo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.baeldung;
22

3+
34
import java.util.function.Function;
45

56
public class UseFoo {

0 commit comments

Comments
 (0)