Skip to content

Upgrade to Spring boot 2 and other Library upgrades. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ranadas wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade to Spring boot 2 and other Library upgrades. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a120019
Upgrade Spring
ranadas Jun 1, 2019
e447993
Upgrade libraries and main artifact Id.
ranadas Jun 2, 2019
89c4c60
Upgrade libraries (spring cloud )and main artifact Id.
ranadas Jun 2, 2019
db74425
Add Lombok
ranadas Jun 2, 2019
f9dd38f
Upgrade libs
ranadas Jun 2, 2019
3dc6b2b
Formatting,
ranadas Jun 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 27 additions & 25 deletions api-gateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,58 @@

<groupId>com.quebic.apigateway</groupId>
<artifactId>api-gateway</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.1.1-SNAPSHOT</version>
<packaging>jar</packaging>

<name>api-gateway</name>
<url>http://maven.apache.org</url>
<url/>

<properties>
<!-- versions -->
<java.version>1.8</java.version>
<!-- versions -->

<http.port>8080</http.port>

<zuul.version>1.4.7.RELEASE</zuul.version>
</properties>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.2.RELEASE</version>
<version>2.1.5.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<dependencies>
<!-- Spring MVC & REST, use Embedded Tomcat -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Spring Cloud starter -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>

<!-- Eureka service registration -->

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>

<!-- Zuul - Gateway -->
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter</artifactId>-->
<!-- </dependency>-->
<!-- -->
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-eureka-server</artifactId>-->
<!-- </dependency>-->
<!-- -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zuul</artifactId>
<version>${zuul.version}</version>
</dependency>

<!-- Logger -->

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand All @@ -60,16 +65,13 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<!-- Logger -->

<!-- Spring - Devtools for refresh server -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>

<!-- Testing starter -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand All @@ -82,7 +84,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.RELEASE</version>
<version>Greenwich.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 3 additions & 5 deletions api-gateway/src/main/java/com/quebic/apigateway/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
@EnableZuulProxy
@EnableDiscoveryClient
@SpringBootApplication
public class App
{
public static void main( String[] args )
{
SpringApplication.run(App.class, args);
public class App {
public static void main(String[] args) {
SpringApplication.run(App.class, args);
}
}
19 changes: 7 additions & 12 deletions api-gateway/src/test/java/com/nexca/apigateway/AppTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,27 @@
/**
* Unit test for simple App.
*/
public class AppTest
extends TestCase
{
public class AppTest extends TestCase {
/**
* Create the test case
*
* @param testName name of the test case
*/
public AppTest( String testName )
{
super( testName );
public AppTest(String testName) {
super(testName);
}

/**
* @return the suite of tests being tested
*/
public static Test suite()
{
return new TestSuite( AppTest.class );
public static Test suite() {
return new TestSuite(AppTest.class);
}

/**
* Rigourous Test :-)
*/
public void testApp()
{
assertTrue( true );
public void testApp() {
assertTrue(true);
}
}
79 changes: 44 additions & 35 deletions auth-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@

<groupId>com.quebic.auth.api</groupId>
<artifactId>auth-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.1.1-SNAPSHOT</version>
<packaging>jar</packaging>

<name>auth-service</name>
<url>http://maven.apache.org</url>
<url/>

<properties>

<!-- versions -->
<java.version>1.8</java.version>
<jjwt.version>0.7.0</jjwt.version>
<rxjava.version>1.1.6</rxjava.version>
<jjwt.version>0.9.1</jjwt.version>
<rxjava.version>1.3.8</rxjava.version>
<imgscalr>4.2</imgscalr>
<mail.version>1.4</mail.version>
<poi.version>3.10.1</poi.version>
<common.lib.version>0.0.1-SNAPSHOT</common.lib.version>
<poi.version>4.1.0</poi.version>
<common.lib.version>0.1.1-SNAPSHOT</common.lib.version>
<!-- versions -->

<http.port>81</http.port>
Expand All @@ -37,108 +37,117 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.2.RELEASE</version>
<version>2.1.5.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<dependencies>

<!-- Spring MVC & REST, use Embedded Tomcat -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Spring Cloud starter -->

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>

<!-- Eureka service registration -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-eureka-server</artifactId>-->
<!-- <version>1.4.7.RELEASE</version>-->
<!-- </dependency>-->

<!-- Spring Security -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>

<!-- Spring Data - Mongo -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
</dependency>

<!-- Spring Mobile Devices -->
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.mobile</groupId>
<artifactId>spring-mobile-device</artifactId>
<version>1.1.5.RELEASE</version>
</dependency>

<!-- JWT -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jjwt.version}</version>
</dependency>

<!-- RxJava -->
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava.version}</version><!--$NO-MVN-MAN-VER$-->
</dependency>

<!-- Logger -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>ch.qos.logback</groupId>-->
<!-- <artifactId>logback-classic</artifactId>-->
<!-- </dependency>-->

<!-- <dependency>-->
<!-- <groupId>ch.qos.logback</groupId>-->
<!-- <artifactId>logback-core</artifactId>-->
<!-- </dependency>-->
<!-- Logger -->

<!-- Java Email API -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${mail.version}</version>
</dependency>

<!-- common-lib -->
<dependency>
<groupId>com.quebic.common</groupId>
<artifactId>common-lib</artifactId>
<version>${common.lib.version}</version>
</dependency>

<!-- Spring - Devtools for refresh server -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>

<!-- Testing starter -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.8</version>
<scope>compile</scope>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.RELEASE</version>
<version>Greenwich.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
6 changes: 2 additions & 4 deletions auth-service/src/main/java/com/quebic/auth/api/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
@EnableDiscoveryClient
@EnableCaching
@EnableScheduling
public class App
{
public static void main( String[] args )
{
public class App {
public static void main(String[] args) {
SpringApplication.run(App.class, args);
}
}
Loading