main
5 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 honeymoose
|
a51b7b55d9 |
Merge remote-tracking branch 'Baeldung/master' into active_mq
# Conflicts: # .gitignore # LICENSE # README.md # core-java-modules/README.md # core-java-modules/core-java-11/README.md # core-java-modules/core-java-11/pom.xml # core-java-modules/core-java-8/README.md # core-java-modules/core-java-8/pom.xml # core-java-modules/core-java-8/src/main/resources/logback.xml # core-java-modules/core-java-annotations/README.md # core-java-modules/core-java-annotations/pom.xml # core-java-modules/core-java-collections-2/README.md # core-java-modules/core-java-collections-2/pom.xml # core-java-modules/core-java-collections-3/README.md # core-java-modules/core-java-collections-3/pom.xml # core-java-modules/core-java-collections-conversions-2/README.md # core-java-modules/core-java-collections-conversions-2/pom.xml # core-java-modules/core-java-collections-conversions/README.md # core-java-modules/core-java-collections-conversions/pom.xml # core-java-modules/core-java-collections-list/README.md # core-java-modules/core-java-collections-list/pom.xml # core-java-modules/core-java-collections/pom.xml # core-java-modules/core-java-datetime-conversion/README.md # core-java-modules/core-java-datetime-conversion/pom.xml # core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetime/ConvertInstantToTimestampUnitTest.java # core-java-modules/core-java-io-2/pom.xml # core-java-modules/core-java-io/README.md # core-java-modules/core-java-io/pom.xml # core-java-modules/core-java-io/src/test/resources/fileTest.txt # core-java-modules/core-java-io/src/test/resources/sampleTextFile.txt # core-java-modules/core-java-lambdas/README.md # core-java-modules/core-java-lambdas/pom.xml # core-java-modules/core-java-serialization/pom.xml # core-java-modules/core-java-streams/README.md # core-java-modules/core-java-streams/pom.xml # core-java-modules/core-java-strings/README.md # core-java-modules/core-java-strings/pom.xml # core-java-modules/core-java-strings/src/test/resources/stringtoolong.txt # core-java-modules/core-java-uuid/README.md # core-java-modules/core-java-uuid/pom.xml # core-java-modules/pom.xml # image-processing/README.md # image-processing/pom.xml # image-processing/src/main/java/com/baeldung/imageprocessing/addingtext/AddText.java # image-processing/src/main/java/com/baeldung/imageprocessing/opencv/CameraStream.java # jackson-modules/jackson-annotations/README.md # jackson-modules/jackson-annotations/pom.xml # jackson-modules/jackson-conversions-2/README.md # jackson-modules/jackson-conversions-2/pom.xml # jackson-modules/jackson-conversions/README.md # jackson-modules/jackson-conversions/pom.xml # jackson-modules/jackson-custom-conversions/README.md # jackson-modules/jackson-custom-conversions/pom.xml # jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/defaultserializercustomserializer/CallingDefaultSerializerUnitTest.java # jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/deserialization/CustomDeserializationUnitTest.java # jackson-modules/jackson-exceptions/README.md # jackson-modules/jackson-exceptions/pom.xml # jackson-modules/jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java # jackson-modules/jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java # jackson-modules/pom.xml # parent-boot-1/pom.xml # parent-boot-2/pom.xml # parent-boot-3/pom.xml # patterns-modules/design-patterns-architectural/pom.xml # patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDaoImpl.java # patterns-modules/design-patterns-behavioral-2/README.md # patterns-modules/design-patterns-behavioral-2/pom.xml # patterns-modules/design-patterns-creational-2/README.md # patterns-modules/design-patterns-creational-2/pom.xml # patterns-modules/design-patterns-singleton/README.md # patterns-modules/design-patterns-structural/src/main/resources/log4jstructuraldp.properties # patterns-modules/enterprise-patterns/pom.xml # patterns-modules/intercepting-filter/pom.xml # patterns-modules/pom.xml # persistence-modules/activejdbc/pom.xml # persistence-modules/hibernate5/README.md # persistence-modules/hibernate5/pom.xml # persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/CustomInterceptor.java # persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/entity/User.java # persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/namingstrategy/CustomPhysicalNamingStrategy.java # persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/persistjson/Customer.java # persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/persistjson/HashMapConverter.java # persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryIdClass.java # persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryPK.java # persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/IdentifiersIntegrationTest.java # persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/bootstrap/BootstrapAPIIntegrationTest.java # persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/proxy/HibernateProxyUnitTest.java # persistence-modules/hibernate5/src/test/resources/hibernate-interceptors.properties # persistence-modules/hibernate5/src/test/resources/hibernate-lifecycle.properties # persistence-modules/hibernate5/src/test/resources/hibernate-namingstrategy.properties # persistence-modules/hibernate5/src/test/resources/hibernate-persistjson.properties # persistence-modules/hibernate5/src/test/resources/hibernate.properties # persistence-modules/pom.xml # persistence-modules/spring-data-jpa-crud/pom.xml # persistence-modules/spring-data-jpa-crud/src/main/java/com/baeldung/repository/FruitRepository.java # persistence-modules/spring-data-jpa-repo-2/README.md # persistence-modules/spring-data-jpa-repo-2/pom.xml # persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/customrepository/model/User.java # persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/customrepository/repository/CustomUserRepositoryImpl.java # persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/saveperformance/Book.java # persistence-modules/spring-data-jpa-repo-2/src/main/resources/application.properties # persistence-modules/spring-data-mongodb-reactive/pom.xml # persistence-modules/spring-data-redis/README.md # persistence-modules/spring-data-redis/pom.xml # persistence-modules/spring-data-redis/src/main/java/com/baeldung/spring/data/reactive/redis/config/RedisConfig.java # persistence-modules/spring-data-redis/src/main/java/com/baeldung/spring/data/redis/config/RedisConfig.java # persistence-modules/spring-data-redis/src/main/java/com/baeldung/spring/data/redis/model/Student.java # persistence-modules/spring-data-redis/src/main/java/com/baeldung/spring/data/redis/queue/RedisMessageSubscriber.java # persistence-modules/spring-data-redis/src/test/java/com/baeldung/spring/data/reactive/redis/template/RedisKeyCommandsManualTest.java # persistence-modules/spring-data-redis/src/test/java/com/baeldung/spring/data/reactive/redis/template/RedisTemplateListOpsManualTest.java # persistence-modules/spring-data-redis/src/test/java/com/baeldung/spring/data/reactive/redis/template/RedisTemplateValueOpsManualTest.java # persistence-modules/spring-data-redis/src/test/java/com/baeldung/spring/data/redis/repo/StudentRepositoryManualTest.java # pom.xml # testing-modules/assertion-libraries/README.md # testing-modules/assertion-libraries/pom.xml # testing-modules/junit-5-basics/README.md # testing-modules/junit-5-basics/pom.xml # testing-modules/mockito-2/src/main/java/com/baeldung/nullmatcher/Helper.java # testing-modules/mockito-2/src/main/java/com/baeldung/nullmatcher/Main.java # testing-modules/mockito-2/src/main/java/com/baeldung/wantedbutnotinvocked/Helper.java # testing-modules/mockito-2/src/main/java/com/baeldung/wantedbutnotinvocked/Main.java # testing-modules/mockito-2/src/test/java/com/baeldung/nullmatcher/MainUnitTest.java # testing-modules/mockito-2/src/test/java/com/baeldung/wantedbutnotinvocked/MainUnitTest.java # testing-modules/pom.xml # testing-modules/spring-mockito/pom.xml # web-modules/dropwizard/pom.xml # web-modules/jakarta-ee/README.md # web-modules/jakarta-ee/pom.xml # web-modules/jakarta-ee/src/test/java/com/baeldung/eclipse/krazo/UserControllerUnitTest.java # web-modules/java-lite/pom.xml # web-modules/javax-servlets-2/README.md # web-modules/javax-servlets-2/pom.xml # web-modules/javax-servlets/pom.xml # web-modules/jee-7/pom.xml # web-modules/jooby/pom.xml # web-modules/ninja/pom.xml # web-modules/pom.xml # web-modules/ratpack/pom.xml # web-modules/resteasy/pom.xml # web-modules/restx/pom.xml # web-modules/spark-java/pom.xml # web-modules/vraptor/pom.xml # xml/README.md # xml/pom.xml # xml/src/main/resources/customer-binding.xml # xml/src/main/resources/sax/baeldung.xml # xml/src/test/resources/example_default_parser.xml # xml/src/test/resources/example_dom4j.xml # xml/src/test/resources/example_jaxb.xml # xml/src/test/resources/example_jaxen.xml # xml/src/test/resources/example_jdom.xml # xml/src/test/resources/example_stax.xml # xml/src/test/resources/sax/baeldung.xml # xml/src/test/resources/xml/websites.xml # xml/src/test/resources/xml/xee_attribute.xml |
||
|
honeymoose
|
83883319ab | 删除编译错误 | ||
 panos-kakos
|
34fec650c0 | [JAVA-32166] Clean up (#16091) | ||
|
panos-kakos
|
0f6149ef8c | [JAVA-26735] Upgraded gson library to 2.10.1 version | ||
|
panos-kakos
|
0b9549bd3e |
[JAVA-13854] Half list moved (#12598)
* [JAVA-13854] added parent module * [JAVA-13854] moved apache-tapestry(submodule) to web-modules(parent) * [JAVA-13854] moved bootique(submodule) to web-modules(parent) * [JAVA-13854] moved dropwizard(submodule) to web-modules(parent) * [JAVA-13854] moved blade(submodule) to web-modules(parent) * [JAVA-13854] moved java-lite(submodule) to web-modules(parent) * [JAVA-13854] moved jooby(submodule) to web-modules(parent) * [JAVA-13854] moved linkrest(submodule) to web-modules(parent) * [JAVA-13854] moved ninja(submodule) to web-modules(parent) * [JAVA-13854] moved ratpack(submodule) to web-modules(parent) * [JAVA-13854] moved resteasy(submodule) to web-modules(parent) * [JAVA-13854] moved restx(submodule) to web-modules(parent) * [JAVA-13854] moved spark-java(submodule) to web-modules(parent) * [JAVA-13854] moved vraptor(submodule) to web-modules(parent) * [JAVA-13854] delete modules that were moved * [JAVA-13854] * [JAVA-13854] * [JAVA-13854] delete ninja submodule + moved raml(submodule) to web-modules(parent) * [JAVA-13854] moved gwt(submodule) to web-modules(parent) * [JAVA-13854] moved jakarta-ee(submodule) to web-modules(parent) * [JAVA-13854] moved javax-servlets(submodule) to web-modules(parent) * [JAVA-13854] moved javax-servlets-2(submodule) to web-modules(parent) * [JAVA-13854] moved jee-7(submodule) to web-modules(parent) * [JAVA-13854] moved play-framework(not a module) to web-modules * [JAVA-13854] fix failing test * [JAVA-13854] moved struts-2(submodule) to web-modules(parent) * [JAVA-13854] moved wicket(submodule) to web-modules(parent) * [JAVA-13854] deleted modules that were moved to web-modules * JAVA-13854 Removed moved modules from the main pom.xml Co-authored-by: panagiotiskakos <panagiotis.kakos@libra-is.com> Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com> |