iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,755 Commits 6 Branches 0 Tags
beaf59933ea7ffae20b9e1f6b68a241173ece6f7
Commit Graph
4755 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
slavisa-baeldung beaf59933e Merge pull request #1281 from eugenp/sla-pr/1159-tim-doha 
BAEL-574 - Intro to Zipkin
 2017-03-02 09:19:13 +01:00
slavisa-baeldung 73e195b190 BAEL-574 - Removing obsolete test 2017-03-02 05:49:21 +01:00
slavisa-baeldung 3b91bb63d1 Merge branch 'master' into sla-pr/1159-tim-doha 
Conflicts:
	spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml
	spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java
	spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml
	spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java
 2017-03-02 05:43:19 +01:00
Adam InTae Gerard 41bf9ddd6d BAEL-9 Final (#1262) 
* BAEL-9 #3

* pom.xml fix

* Final
 2017-03-01 22:29:55 -06:00
slavisa-baeldung 36f79aa956 Merge pull request #1277 from eugenp/sla-pr/1272-testng 
BAEL-701 - TestNG advanced
 2017-03-02 05:28:05 +01:00
KevinGilmore 5421a352ab BAEL-345: SolrJ (#1263) 
* BAEL-278: Updated README.md

* BAEL-554: Add and update README.md files

* BAEL-345: fixed assertion

* BAEL-109: Updated README.md
 2017-03-01 22:20:07 -06:00
slavisa-baeldung e302aaa1db Merge pull request #1278 from eugenp/pr-BAEL-41-Log4j2-layouts-appenders-filters 
BAEL-41 - Log4J 2 Layout, Appenders, Filters
 2017-03-01 23:14:04 +01:00
slavisa-baeldung efdd45259f BAEL-701 - TestNG reformatting 2017-03-01 22:37:00 +01:00
slavisa-baeldung 95e24dac2a Merge branch 'master' into sla-pr/1272-testng 2017-03-01 22:20:59 +01:00
slavisa-baeldung 6590e02bd4 Merge remote-tracking branch 'origin/master' 2017-03-01 22:20:11 +01:00
slavisa-baeldung 5708348eee Merge remote-tracking branch 'origin/master' into pr-BAEL-41-Log4j2-layouts-appenders-filters 2017-03-01 22:11:10 +01:00
Muhammet Oğuz ÖZCAN 52a3565f39 Seems no conflict (#1274) 
* Bean Injection Project is added

Different Types of Bean Injection article codes are added.

* Java-based configuration added

Java-based configuration and tests are added. Coding styles are fixed.

* List of Lists Article Codes added.

List of Lists Article Codes added.

* Most popular use case of grouping elements together added

Most popular use case of grouping elements together added
 2017-03-01 21:41:28 +01:00
dhruba619 d1f0b2e554 BAEL-701 Introduction to TestNG 2017-03-01 16:47:07 +05:30
slavisa-baeldung 46b79202f7 Merge remote-tracking branch 'origin/master' 2017-03-01 06:38:14 +01:00
mujahid 442c00545c BAEL-347-Full-text search with SOLR (#1254) 
* solr-fulltext-search module created

* solr-fulltext-search modue created

* solr-fulltext-search change
s

* pom changes merged from upstream
 2017-02-28 19:00:13 +01:00
Nancy Bosecker 1bfc944c5a Added more indexing/delete/query examples to code (#1251) 
* Solr w Apache SolrJ

* Solr w Apache SolrJ

* updated test names and moved add to @before method

* create apache-solrj module, moved code from spring-data-solr

* More examples for indexing,delete,and query for solrj

* More examples for indexing,delete,and query for solrj
 2017-02-27 22:26:30 -06:00
tschiman 0d31cab067 BAEL-574 removing zipkin URL since we are setting it in our custom configuration 2017-02-27 20:52:22 -07:00
maibin 29882a1f06 Ant Colony Optimization (#1237) 2017-02-27 12:59:20 -06:00
Grzegorz Piwowarek 5930f9dcbb Refactor SpringDataRelationshipsTest (#1258) 2017-02-27 19:31:02 +01:00
lor6 8617faf9cf data rest crud, angular fe (#1199) 
* data rest crud, angular fe

* fix formatting, remove extra imports

* fix config

* change student entity to employee

* expose ids

* update boot version, removes ids, check null id
 2017-02-27 09:04:00 -06:00
pedja4 288d464e16 Merge pull request #1255 from eugenp/pedja4-patch-1 
BAEL-343 Renamed one test
 2017-02-27 11:43:36 +01:00
pedja4 ef610affc9 BAEL-343 Renamed one test 2017-02-27 10:18:31 +01:00
Pedja 065640b8d4 Merge branch 'mogronalol-BAEL-343' 2017-02-27 10:14:24 +01:00
slavisa-baeldung e6c1562f83 BAEL-41 - Commenting out failover configuration 2017-02-27 07:10:30 +01:00
slavisa-baeldung 6564693ea5 BAEL-41 - Renaming tests 2017-02-27 06:47:30 +01:00
KevinGilmore f1b4ac4cb9 BAEL-554: README.md files (#1252) 
* BAEL-278: Updated README.md

* BAEL-554: Add and update README.md files
 2017-02-26 19:53:56 -06:00
lor6 1a067bc945 models, repos, test (#1225) 
* models, repos, test

* update models and test

* updated test location

* update test location
 2017-02-26 13:30:47 -06:00
Sandeep4odesk 7f20437cb0 Adding Hibernate 5 Project (#1129) 
* Changes in assert statement

* Adding Hibernate 5 Project

* Adding Hibernate 5 Project
 2017-02-26 12:56:52 -06:00
Muhammet Oğuz ÖZCAN 325466a782 Master (#1250) 
* Bean Injection Project is added

Different Types of Bean Injection article codes are added.

* Java-based configuration added

Java-based configuration and tests are added. Coding styles are fixed.

* List of Lists Article Codes added.

List of Lists Article Codes added.
 2017-02-26 18:53:32 +01:00
Daniele Demichelis d4576d9762 BAEL-554 - Increased timeout (#1242) 
* Burlap & Hessian server added

* Burlap & Hessian client work

* Fixed main

* Fixed formatting

* Spring Remote example based on Burlap & Hessian runs in a JUnit test

* Fixed main

* Fixed formatting

* Spring Remote example based on Burlap & Hessian runs in a JUnit test

* Spring Remote example based on Burlap & Hessian runs in a JUnit test

* Burlap & Hessian client work

* Fixed main

* Fixed main

* Fixed formatting

* Fixed formatting

* Spring Remote example based on Burlap & Hessian runs in a JUnit test

* Spring Remote example based on Burlap & Hessian runs in a JUnit test

* Fixed POM
 2017-02-26 11:49:01 -06:00