Skip to content

Commit 2b053ac

Browse files
author
Imre Balassa
committed
Merge remote-tracking branch 'upstream/master'
2 parents 76d17d7 + 42d8fab commit 2b053ac

File tree

1,974 files changed

+63812
-8971
lines changed

Some content is hidden

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

1,974 files changed

+63812
-8971
lines changed

‎.gitignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,17 @@ dependency-reduced-pom.xml
4848
*.so
4949
*.dylib
5050
*.dll
51+
52+
xml/src/test/resources/example_dom4j_new.xml
53+
xml/src/test/resources/example_dom4j_updated.xml
54+
xml/src/test/resources/example_jaxb_new.xml
55+
core-java-io/hard_link.txt
56+
core-java-io/target_link.txt
57+
core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
58+
ethereum/logs/
59+
jmeter/src/main/resources/*-JMeter.csv
60+
61+
**/node_modules/
62+
**/dist
63+
**/tmp
64+
**/out-tsc

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ before_install:
44
- echo "MAVEN_OPTS='-Xmx2048M -Xss128M -XX:+CMSClassUnloadingEnabled -XX:+UseG1GC -XX:-UseGCOverheadLimit'" > ~/.mavenrc
55

66
install: skip
7-
script: travis_wait 60 mvn -q install
7+
script: travis_wait 60 mvn -q install -Pdefault
88

99
sudo: required
1010

‎JGit/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>com.baeldung</groupId>
56
<artifactId>JGitSnippets</artifactId>
@@ -45,7 +46,6 @@
4546
</dependencies>
4647

4748
<properties>
48-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4949
<org.eclipse.jgit.version>4.5.0.201609210915-r</org.eclipse.jgit.version>
5050
</properties>
5151

‎JGit/src/main/resources/logback.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<root level="INFO">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ In additional to Spring, the following technologies are in focus: `core Java`, `
1919

2020
Building the project
2121
====================
22-
To do the full build, do: `mvn install -Dgib.enabled=false`
22+
To do the full build, do: `mvn install -Pdefault -Dgib.enabled=false`
2323

2424

2525
Working with the code in Eclipse

‎Twitter4J/pom.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<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/maven-v4_0_0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4+
45
<groupId>com.mabsisa</groupId>
56
<artifactId>Twitter4J</artifactId>
67
<packaging>jar</packaging>
@@ -14,17 +15,11 @@
1415
<version>1.0.0-SNAPSHOT</version>
1516
</parent>
1617

17-
<properties>
18-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<java.version>1.8</java.version>
21-
</properties>
22-
2318
<dependencies>
2419
<dependency>
2520
<groupId>org.twitter4j</groupId>
2621
<artifactId>twitter4j-stream</artifactId>
27-
<version>4.0.6</version>
22+
<version>${twitter4j-stream.version}</version>
2823
</dependency>
2924
</dependencies>
3025

@@ -49,4 +44,8 @@
4944
</plugins>
5045
</build>
5146

47+
<properties>
48+
<twitter4j-stream.version>4.0.6</twitter4j-stream.version>
49+
</properties>
50+
5251
</project>

‎Twitter4J/src/main/resources/logback.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<root level="INFO">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

‎activejdbc/pom.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<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">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.baeldung</groupId>
55
<artifactId>activejdbc</artifactId>
@@ -15,12 +15,6 @@
1515
</parent>
1616

1717
<dependencies>
18-
<dependency>
19-
<groupId>junit</groupId>
20-
<artifactId>junit</artifactId>
21-
<version>${junit.version}</version>
22-
<scope>test</scope>
23-
</dependency>
2418
<dependency>
2519
<groupId>org.javalite</groupId>
2620
<artifactId>activejdbc</artifactId>
@@ -133,10 +127,8 @@
133127
</pluginRepositories>
134128

135129
<properties>
136-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
137130
<activejdbc.version>1.4.13</activejdbc.version>
138131
<environments>development.test,development</environments>
139-
<org.slf4j.version>1.7.9</org.slf4j.version>
140132
<mysql.connector.version>5.1.34</mysql.connector.version>
141133
</properties>
142134

‎activejdbc/src/main/resources/logback.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<root level="INFO">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

0 commit comments

Comments
 (0)