iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into BAEL-9017

This commit is contained in:
Loredana Crusoveanu 2018-09-30 08:46:57 +03:00 committed by GitHub
parent ac15191bf6 a91812d4ea
commit d19c5a94ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache-avro/pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.baeldung</groupId>
<artifactId>apache-avro</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Apache Avro</version>
<name>Apache Avro</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

2
apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerTest.java → apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerUnitTest.java
View File

@ -13,7 +13,7 @@ import java.util.Objects;
import static org.junit.Assert.*;
public class AvroSerealizerDeSerealizerTest {
public class AvroSerealizerDeSerealizerUnitTest {
AvroSerealizer serealizer;
AvroDeSerealizer deSerealizer;

1
flyway/pom.xml
View File

@ -65,6 +65,7 @@
<properties>
<flyway-core.version>5.0.2</flyway-core.version>
<flyway-maven-plugin.version>5.0.2</flyway-maven-plugin.version>
<h2.version>1.4.195</h2.version>
</properties>
</project>

2
flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java → flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationUnitTest.java
View File

@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
@ContextConfiguration(classes = FlywayCallbackTestConfig.class)
public class FlywayApplicationTest {
public class FlywayApplicationUnitTest {
private Log log = LogFactory.getLog(getClass());

2
guest/spring-mvc/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.M5</version>
<version>2.0.0.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
guest/spring-security/pom.xml
View File

@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.M6</version>
<version>2.0.0.RELEASE</version>
<relativePath />
</parent>

20
pom.xml
View File

@ -611,11 +611,11 @@
<module>java-websocket</module>
<module>activejdbc</module>
<module>animal-sniffer-mvn-plugin</module>
<!-- <module>apache-avro</module> --><!-- Malformed POM -->
<module>apache-avro</module>
<module>apache-bval</module>
<module>apache-shiro</module>
<module>apache-spark</module>
<!-- <module>asciidoctor</module> --><!-- Malformed POM -->
<module>asciidoctor</module>
<module>checker-plugin</module>
<!-- <module>core-java-10</module> --><!-- Not upgraded to java 10 -->
<!-- <module>core-java-11</module> --><!-- Not upgraded to java 11 -->
@ -624,7 +624,7 @@
<module>dagger</module>
<module>data-structures</module>
<module>dubbo</module>
<!-- <module>flyway</module> --><!-- Malformed POM -->
<module>flyway</module>
<!-- <module>grpc</module> --><!-- protobuf-maven-plugin filecopy failure -->
<module>java-difference-date</module>
<!-- <module>JGit</module> --><!-- Unit test failure -->
@ -638,7 +638,7 @@
<module>spring-boot-autoconfiguration</module>
<module>spring-boot-custom-starter</module>
<module>spring-boot-jasypt</module>
<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
<module>spring-custom-aop</module>
<module>spring-data-rest-querydsl</module>
<module>spring-groovy</module>
<module>spring-mobile</module>
@ -667,8 +667,8 @@
<!-- <module>guest/memory-leaks</module> --><!-- guest post on different site -->
<!-- <module>guest/remote-debugging</module> --><!-- guest post on different site -->
<!-- <module>guest/spring-boot-app</module> --><!-- guest post on different site -->
<!-- <module>guest/spring-mvc</module> --><!-- Malformed POM -->
<!-- <module>guest/spring-security</module> --><!-- Malformed POM -->
<!-- <module>guest/spring-mvc</module> --><!-- guest post on different site -->
<!-- <module>guest/spring-security</module> --><!-- guest post on different site -->
<!-- <module>guest/thread-pools</module> --><!-- guest post on different site -->
<!-- <module>guest/tomcat-app</module> --><!-- guest post on different site -->
<module>jenkins/hello-world</module>
@ -1096,7 +1096,7 @@
<module>dagger</module>
<module>data-structures</module>
<module>dubbo</module>
<!-- <module>flyway</module> --><!-- Malformed POM -->
<module>flyway</module>
<!-- <module>grpc</module> --><!-- protobuf-maven-plugin filecopy failure -->
<module>java-difference-date</module>
<!-- <module>JGit</module> --><!-- Unit test failure -->
@ -1110,7 +1110,7 @@
<module>spring-boot-autoconfiguration</module>
<module>spring-boot-custom-starter</module>
<module>spring-boot-jasypt</module>
<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
<module>spring-custom-aop</module>
<module>spring-data-rest-querydsl</module>
<module>spring-groovy</module>
<module>spring-mobile</module>
@ -1139,8 +1139,8 @@
<!-- <module>guest/memory-leaks</module> --><!-- guest post on different site -->
<!-- <module>guest/remote-debugging</module> --><!-- guest post on different site -->
<!-- <module>guest/spring-boot-app</module> --><!-- guest post on different site -->
<!-- <module>guest/spring-mvc</module> --><!-- Malformed POM -->
<!-- <module>guest/spring-security</module> --><!-- Malformed POM -->
<!-- <module>guest/spring-mvc</module> --><!-- guest post on different site -->
<!-- <module>guest/spring-security</module> --><!-- guest post on different site -->
<!-- <module>guest/thread-pools</module> --><!-- guest post on different site -->
<!-- <module>guest/tomcat-app</module> --><!-- guest post on different site -->
<module>jenkins/hello-world</module>

1
spring-custom-aop/pom.xml
View File

@ -149,6 +149,7 @@
<subethasmtp.version>3.1.7</subethasmtp.version>
<tomee-servlet-api.version>8.5.11</tomee-servlet-api.version>
<guava.version>18.0</guava.version>
<tomcat.version>8.0.43</tomcat.version>
</properties>
</project>