Commit Graph

2444 Commits

Author SHA1 Message Date
tomjoebob eacc4bdd57 Merge pull request #466 from emre-aydin/minify-js-css-maven
Minify Javascript and CSS files by using YUI compressor Maven plugin
2016-07-11 13:52:30 -06:00
Zeger Hendrikse 648fb26ca2 Merge pull request #483 from nguyennamthai/master
Introduction to Apache-CXF
2016-07-11 13:55:27 +02:00
DOHA da58ba479d upgrade jackson 2016-07-11 12:23:02 +02:00
Slavisa Baeldung 73a89d9400 BAEL-151 - added dep, minor changes 2016-07-11 10:30:40 +02:00
Slavisa Baeldung cc5f4770dd Merge remote-tracking branch 'origin/pr/489' 2016-07-11 10:27:47 +02:00
k0l0ssus f12d31fa89 JSTL library namespace import 2016-07-10 23:14:49 -04:00
k0l0ssus 5d8559ade0 Update el_intro.xhtml
Snippet to demonstrate use of an implicit EL component
2016-07-10 23:10:51 -04:00
Sergey Petunin d0e35e7022 Added test examples for the article "Hibernate: save, persist, update, merge, saveOrUpdate" (#487) 2016-07-10 22:28:34 +02:00
emre 1a28fbe93e Minify Javascript and CSS files by using YUI compressor Maven plugin 2016-07-10 22:25:32 +03:00
Alex Theedom afb2e977fb Update test to match code in the article 2016-07-10 16:41:03 +01:00
Alex Theedom 17ed679d5a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java
2016-07-10 16:39:45 +01:00
Alex Theedom 9cdb683e00 Update test to match code in the article 2016-07-10 16:36:05 +01:00
Guillermo Casanova 40cb44a47a Imported and applied formatter 2016-07-10 11:03:46 +02:00
Alex Theedom fb35d6aac5 Merge pull request #486 from eugenp/assertj-guava
Fix MMap examples
2016-07-09 16:56:43 +01:00
Thai Nguyen 2673f28612 Adds default goal to exec plugin 2016-07-09 21:30:19 +07:00
Grzegorz Piwowarek 67eff7ce57 Add MMap examples 2016-07-09 15:08:33 +02:00
Alex Theedom cc6b6419a9 Change variable name to be consistence with article text 2016-07-09 10:45:13 +01:00
Thai Nguyen 1f48db7994 Adds skipTests attribute 2016-07-09 15:32:08 +07:00
Thai Nguyen afff1c57a0 Add server profile 2016-07-09 15:29:29 +07:00
Alex Theedom c5411b6897 Merge pull request #485 from eugenp/assertj-guava
Additional Multimap examples for Assertj series
2016-07-09 09:22:31 +01:00
Grzegorz Piwowarek edc6a6e0ec Add MMap examples 2016-07-09 07:49:38 +02:00
Zeger Hendrikse abf570a80b Removed tabs 2016-07-08 23:30:35 +02:00
Zeger Hendrikse d166bb0ca3 Merge branch 'master' of https://github.com/nguyennamthai/tutorials into nguyennamthai-master 2016-07-08 23:24:38 +02:00
Thai Nguyen 6befb0a5a6 Minor fixes for Introduction to Apache CXF 2016-07-08 23:54:16 +07:00
DOHA 79ec294fd9 add systemPropertiesModeName example 2016-07-08 18:49:51 +02:00
tomjoebob ed3e1f4553 Merge pull request #484 from ivanp81/master
Add JSON Schema validation
2016-07-08 10:07:19 -06:00
Ivan Paolillo 1c26667182 Remove unneeded file 2016-07-08 18:02:31 +02:00
Ivan Paolillo d97a45447a Remove unneeded file 2016-07-08 17:57:19 +02:00
Zeger Hendrikse 7109aad7a5 Removed Eclipse files 2016-07-08 17:27:38 +02:00
Zeger Hendrikse 7e55c7e832 Merge branch 'master' of https://github.com/nguyennamthai/tutorials into nguyennamthai-master 2016-07-08 15:37:23 +02:00
Zeger Hendrikse bfaa0157bb Replaced tabs 2016-07-08 15:11:55 +02:00
Zeger Hendrikse 8a56b2ac24 Merge branch 'juliuskrah-master' 2016-07-08 13:50:18 +02:00
Zeger Hendrikse 97313afc6d Replaced tabs by spaces 2016-07-08 13:49:04 +02:00
Zeger Hendrikse 69bd36adb2 Replaced tabs by spaces 2016-07-08 13:35:45 +02:00
Zeger Hendrikse bb7b2f2297 Merge branch 'master' of https://github.com/eugenp/tutorials into gcasanova-master 2016-07-08 13:34:47 +02:00
Ivan Paolillo a31eaf73ec Add JSON Schema validation 2016-07-08 10:44:07 +02:00
Slavisa Baeldung e80bc6e238 Merge branch 'pr/470-alexB-logging' 2016-07-08 10:00:09 +02:00
slavisa-baeldung c9d51d3e60 Merge pull request #470 from aborkov/master
Added log4j project
2016-07-08 09:58:20 +02:00
Slavisa Baeldung 1a11364e57 BAEL-38 - Minor changes 2016-07-08 09:57:47 +02:00
Slavisa Baeldung 16295e6f7b Merge branch 'master' into pr/470-alexB-logging 2016-07-08 09:52:23 +02:00
Slavisa Baeldung 57ebe60697 Merge remote-tracking branch 'origin/pr/470' into pr/470-alexB-logging
Conflicts:
	log4j/pom.xml
	log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
	log4j/src/main/java/com/baeldung/logback/LogbackExample.java
	log4j/src/main/resources/log4j.xml
	log4j/src/main/resources/log4j2.xml
	log4j/src/main/resources/logback.xml
	pom.xml
2016-07-08 09:51:18 +02:00
Guillermo Casanova f876a94fc5 Declare java compiler version in pom.xml 2016-07-08 07:53:38 +02:00
Thai Nguyen 800da1bbb4 Introduction to Apache-CXF 2016-07-08 06:40:10 +07:00
Julius Krah 60930fc567 Added fix for error 'Unable to find a single main class from the following candidates [org.baeldung.boot.DemoApplication, org.baeldung.main.SpringBootApplication]' 2016-07-07 23:27:34 +00:00
Zeger Hendrikse 16a9492017 Merge branch 'master' of https://github.com/gcasanova/tutorials into gcasanova-master 2016-07-08 01:20:12 +02:00
Zeger Hendrikse 3d0ce36f45 Replaced tabs by spaces 2016-07-08 01:08:32 +02:00
Zeger Hendrikse 8066195a85 Merge branch 'master' of https://github.com/juliuskrah/tutorials into juliuskrah-master 2016-07-08 01:06:13 +02:00
Julius Krah c9865a0dd4 resolved conflicts 2016-07-07 21:49:14 +00:00
Julius Krah d8a8ad354f added source for 'A Guide to Spring Boot in Eclipse'
Added eclipse formatter

Added source for 'A Guide to Spring Boot in Eclipse' and added eclipse
formatter for Baeldung
2016-07-07 21:31:26 +00:00
Grzegorz Piwowarek 9257da4b44 Use interface instead of the implementation 2016-07-07 22:45:39 +02:00