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

Merge branch 'master' of https://github.com/eugenp/tutorials into BAEL-9696

Browse Source
This commit is contained in:
amit2103 2018-10-21 01:11:39 +05:30
commit dec65af500
6 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
parent-boot-2/pom.xml
View File

@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>2.0.4.RELEASE</version> <version>${spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -41,7 +41,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.0.4.RELEASE</version> <version>${spring-boot.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@ -73,6 +73,6 @@
<rest-assured.version>3.1.0</rest-assured.version> <rest-assured.version>3.1.0</rest-assured.version>
<!-- plugins --> <!-- plugins -->
<thin.version>1.0.11.RELEASE</thin.version> <thin.version>1.0.11.RELEASE</thin.version>
<spring-boot.version>2.0.5.RELEASE</spring-boot.version>
</properties> </properties>
</project> </project>

3
pom.xml
View File

@ -491,7 +491,6 @@
<module>spring-core</module> <module>spring-core</module>
<module>spring-cucumber</module> <module>spring-cucumber</module>
<module>spring-ejb</module> <module>spring-ejb</module>
<module>spring-ejb/spring-ejb-client</module>
<module>spring-aop</module> <module>spring-aop</module>
<module>persistence-modules/spring-data-cassandra</module> <module>persistence-modules/spring-data-cassandra</module>
<module>persistence-modules/spring-data-couchbase-2</module> <module>persistence-modules/spring-data-couchbase-2</module>
@ -1034,7 +1033,6 @@
<module>spring-core</module> <module>spring-core</module>
<module>spring-cucumber</module> <module>spring-cucumber</module>
<module>spring-ejb</module> <module>spring-ejb</module>
<module>spring-ejb/spring-ejb-client</module>
<module>spring-aop</module> <module>spring-aop</module>
<module>persistence-modules/spring-data-cassandra</module> <module>persistence-modules/spring-data-cassandra</module>
<module>persistence-modules/spring-data-couchbase-2</module> <module>persistence-modules/spring-data-couchbase-2</module>
@ -1393,7 +1391,6 @@
<module>spring-core</module> <module>spring-core</module>
<module>spring-cucumber</module> <module>spring-cucumber</module>
<module>spring-ejb</module> <module>spring-ejb</module>
<module>spring-ejb/spring-ejb-client</module>
<module>spring-aop</module> <module>spring-aop</module>
<module>persistence-modules/spring-data-dynamodb</module> <module>persistence-modules/spring-data-dynamodb</module>

34
spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml
View File

@ -7,21 +7,51 @@
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<parent> <parent>
<artifactId>parent-boot-1</artifactId> <artifactId>spring-boot-custom-starter</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-1</relativePath> <relativePath>../../spring-boot-custom-starter</relativePath>
</parent> </parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>greeter-spring-boot-starter</artifactId> <artifactId>greeter-spring-boot-starter</artifactId>
<version>${greeter-starter.version}</version> <version>${greeter-starter.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<properties> <properties>
<spring-boot.version>1.5.15.RELEASE</spring-boot.version>
<greeter-starter.version>0.0.1-SNAPSHOT</greeter-starter.version> <greeter-starter.version>0.0.1-SNAPSHOT</greeter-starter.version>
</properties> </properties>

1
spring-boot-custom-starter/pom.xml
View File

@ -19,4 +19,5 @@
<module>greeter-spring-boot-sample-app</module> <module>greeter-spring-boot-sample-app</module>
</modules> </modules>
</project> </project>

1
spring-ejb/pom.xml
View File

@ -73,6 +73,7 @@
<modules> <modules>
<module>ejb-remote-for-spring</module> <module>ejb-remote-for-spring</module>
<module>ejb-beans</module> <module>ejb-beans</module>
<module>spring-ejb-client</module>
</modules> </modules>
<properties> <properties>

20
spring-ejb/spring-ejb-client/pom.xml
View File

@ -10,12 +10,23 @@
<description>Spring EJB Client</description> <description>Spring EJB Client</description>
<parent> <parent>
<groupId>com.baeldung</groupId> <groupId>com.baeldung.spring.ejb</groupId>
<artifactId>parent-boot-2</artifactId> <artifactId>spring-ejb</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>1.0.1</version>
<relativePath>../../parent-boot-2</relativePath>
</parent> </parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.4.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -54,6 +65,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.0.4.RELEASE</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>