diff --git a/micronaut/.mvn/wrapper/maven-wrapper.jar b/micronaut/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 08ebbb67f0..0000000000 Binary files a/micronaut/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/helidon/README.md b/microservices-modules/helidon/README.md similarity index 100% rename from helidon/README.md rename to microservices-modules/helidon/README.md diff --git a/helidon/helidon-mp/pom.xml b/microservices-modules/helidon/helidon-mp/pom.xml similarity index 100% rename from helidon/helidon-mp/pom.xml rename to microservices-modules/helidon/helidon-mp/pom.xml diff --git a/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/LibraryApplication.java b/microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/LibraryApplication.java similarity index 100% rename from helidon/helidon-mp/src/main/java/com/baeldung/microprofile/LibraryApplication.java rename to microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/LibraryApplication.java diff --git a/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/model/Book.java b/microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/model/Book.java similarity index 100% rename from helidon/helidon-mp/src/main/java/com/baeldung/microprofile/model/Book.java rename to microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/model/Book.java diff --git a/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java b/microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java similarity index 100% rename from helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java rename to microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java diff --git a/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java b/microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java similarity index 100% rename from helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java rename to microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java diff --git a/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java b/microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java similarity index 100% rename from helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java rename to microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java diff --git a/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/repo/BookManager.java b/microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/repo/BookManager.java similarity index 100% rename from helidon/helidon-mp/src/main/java/com/baeldung/microprofile/repo/BookManager.java rename to microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/repo/BookManager.java diff --git a/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/util/BookMapper.java b/microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/util/BookMapper.java similarity index 100% rename from helidon/helidon-mp/src/main/java/com/baeldung/microprofile/util/BookMapper.java rename to microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/util/BookMapper.java diff --git a/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java b/microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java similarity index 100% rename from helidon/helidon-mp/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java rename to microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java diff --git a/helidon/helidon-mp/src/main/resources/META-INF/beans.xml b/microservices-modules/helidon/helidon-mp/src/main/resources/META-INF/beans.xml similarity index 97% rename from helidon/helidon-mp/src/main/resources/META-INF/beans.xml rename to microservices-modules/helidon/helidon-mp/src/main/resources/META-INF/beans.xml index faae50dfc2..2ac599bc6b 100644 --- a/helidon/helidon-mp/src/main/resources/META-INF/beans.xml +++ b/microservices-modules/helidon/helidon-mp/src/main/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ - - + + diff --git a/helidon/helidon-mp/src/main/resources/logback.xml b/microservices-modules/helidon/helidon-mp/src/main/resources/logback.xml similarity index 100% rename from helidon/helidon-mp/src/main/resources/logback.xml rename to microservices-modules/helidon/helidon-mp/src/main/resources/logback.xml diff --git a/helidon/helidon-se/pom.xml b/microservices-modules/helidon/helidon-se/pom.xml similarity index 100% rename from helidon/helidon-se/pom.xml rename to microservices-modules/helidon/helidon-se/pom.xml diff --git a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/config/ConfigApplication.java b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/config/ConfigApplication.java similarity index 97% rename from helidon/helidon-se/src/main/java/com/baeldung/helidon/se/config/ConfigApplication.java rename to microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/config/ConfigApplication.java index acfcdb2373..beac5511c1 100644 --- a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/config/ConfigApplication.java +++ b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/config/ConfigApplication.java @@ -1,29 +1,29 @@ -package com.baeldung.helidon.se.config; - -import io.helidon.config.Config; -import io.helidon.config.ConfigSources; -import io.helidon.config.spi.ConfigSource; - -public class ConfigApplication { - - public static void main(String... args) throws Exception { - - ConfigSource configSource = ConfigSources.classpath("application.yaml").build(); - Config config = Config.builder() - .disableSystemPropertiesSource() - .disableEnvironmentVariablesSource() - .sources(configSource) - .build(); - - int port = config.get("server.port").asInt(); - int pageSize = config.get("web.page-size").asInt(); - boolean debug = config.get("web.debug").asBoolean(); - String userHome = config.get("user.home").asString(); - - System.out.println("port: " + port); - System.out.println("pageSize: " + pageSize); - System.out.println("debug: " + debug); - System.out.println("userHome: " + userHome); - } - -} +package com.baeldung.helidon.se.config; + +import io.helidon.config.Config; +import io.helidon.config.ConfigSources; +import io.helidon.config.spi.ConfigSource; + +public class ConfigApplication { + + public static void main(String... args) throws Exception { + + ConfigSource configSource = ConfigSources.classpath("application.yaml").build(); + Config config = Config.builder() + .disableSystemPropertiesSource() + .disableEnvironmentVariablesSource() + .sources(configSource) + .build(); + + int port = config.get("server.port").asInt(); + int pageSize = config.get("web.page-size").asInt(); + boolean debug = config.get("web.debug").asBoolean(); + String userHome = config.get("user.home").asString(); + + System.out.println("port: " + port); + System.out.println("pageSize: " + pageSize); + System.out.println("debug: " + debug); + System.out.println("userHome: " + userHome); + } + +} diff --git a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/Book.java b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/Book.java similarity index 94% rename from helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/Book.java rename to microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/Book.java index 9a591bcc73..90de266717 100644 --- a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/Book.java +++ b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/Book.java @@ -1,49 +1,49 @@ -package com.baeldung.helidon.se.routing; - -public class Book { - private String id; - private String isbn; - private String name; - private String author; - private Integer pages; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIsbn() { - return isbn; - } - - public void setIsbn(String isbn) { - this.isbn = isbn; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAuthor() { - return author; - } - - public void setAuthor(String author) { - this.author = author; - } - - public Integer getPages() { - return pages; - } - - public void setPages(Integer pages) { - this.pages = pages; - } +package com.baeldung.helidon.se.routing; + +public class Book { + private String id; + private String isbn; + private String name; + private String author; + private Integer pages; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsbn() { + return isbn; + } + + public void setIsbn(String isbn) { + this.isbn = isbn; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public Integer getPages() { + return pages; + } + + public void setPages(Integer pages) { + this.pages = pages; + } } \ No newline at end of file diff --git a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookManager.java b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookManager.java similarity index 96% rename from helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookManager.java rename to microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookManager.java index 2e6e694041..1ac77c49c9 100644 --- a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookManager.java +++ b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookManager.java @@ -1,49 +1,49 @@ -package com.baeldung.helidon.se.routing; - -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicInteger; - -public class BookManager { - - private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); - private AtomicInteger bookIdGenerator = new AtomicInteger(0); - - private ConcurrentMap inMemoryStore = new ConcurrentHashMap<>(); - - public BookManager() { - Book book = new Book(); - book.setId(getNextId()); - book.setName("Building Microservice With Oracle Helidon"); - book.setIsbn("11223344"); - book.setAuthor("baeldung"); - book.setPages(560); - inMemoryStore.put(book.getId(), book); - } - - private String getNextId() { - String date = LocalDate.now().format(formatter); - return String.format("%04d-%s", bookIdGenerator.incrementAndGet(), date); - } - - public String add(Book book) { - String id = getNextId(); - book.setId(id); - inMemoryStore.put(id, book); - return id; - } - - public Book get(String id) { - return inMemoryStore.get(id); - } - - public List getAll() { - List books = new ArrayList<>(); - books.addAll(inMemoryStore.values()); - return books; - } +package com.baeldung.helidon.se.routing; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; + +public class BookManager { + + private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); + private AtomicInteger bookIdGenerator = new AtomicInteger(0); + + private ConcurrentMap inMemoryStore = new ConcurrentHashMap<>(); + + public BookManager() { + Book book = new Book(); + book.setId(getNextId()); + book.setName("Building Microservice With Oracle Helidon"); + book.setIsbn("11223344"); + book.setAuthor("baeldung"); + book.setPages(560); + inMemoryStore.put(book.getId(), book); + } + + private String getNextId() { + String date = LocalDate.now().format(formatter); + return String.format("%04d-%s", bookIdGenerator.incrementAndGet(), date); + } + + public String add(Book book) { + String id = getNextId(); + book.setId(id); + inMemoryStore.put(id, book); + return id; + } + + public Book get(String id) { + return inMemoryStore.get(id); + } + + public List getAll() { + List books = new ArrayList<>(); + books.addAll(inMemoryStore.values()); + return books; + } } \ No newline at end of file diff --git a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookResource.java b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookResource.java similarity index 96% rename from helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookResource.java rename to microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookResource.java index 0648930841..b0db191851 100644 --- a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookResource.java +++ b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/BookResource.java @@ -1,58 +1,58 @@ -package com.baeldung.helidon.se.routing; - -import io.helidon.webserver.Routing; -import io.helidon.webserver.ServerRequest; -import io.helidon.webserver.ServerResponse; -import io.helidon.webserver.Service; - -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import java.util.List; - -public class BookResource implements Service { - - private BookManager bookManager = new BookManager(); - - @Override - public void update(Routing.Rules rules) { - rules - .get("/", this::books) - .get("/{id}", this::bookById); - } - - private void bookById(ServerRequest serverRequest, ServerResponse serverResponse) { - //get the book with the given id - String id = serverRequest.path().param("id"); - Book book = bookManager.get(id); - JsonObject jsonObject = from(book); - serverResponse.send(jsonObject); - } - - private void books(ServerRequest serverRequest, ServerResponse serverResponse) { - //get all books - List books = bookManager.getAll(); - JsonArray jsonArray = from(books); - serverResponse.send(jsonArray); - } - - private JsonObject from(Book book) { - JsonObject jsonObject = Json.createObjectBuilder() - .add("id", book.getId()) - .add("isbn", book.getIsbn()) - .add("name", book.getName()) - .add("author", book.getAuthor()) - .add("pages", book.getPages()) - .build(); - return jsonObject; - } - - private JsonArray from(List books) { - JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); - books.forEach(book -> { - jsonArrayBuilder.add(from(book)); - }); - return jsonArrayBuilder.build(); - } -} +package com.baeldung.helidon.se.routing; + +import io.helidon.webserver.Routing; +import io.helidon.webserver.ServerRequest; +import io.helidon.webserver.ServerResponse; +import io.helidon.webserver.Service; + +import javax.json.Json; +import javax.json.JsonArray; +import javax.json.JsonArrayBuilder; +import javax.json.JsonObject; +import java.util.List; + +public class BookResource implements Service { + + private BookManager bookManager = new BookManager(); + + @Override + public void update(Routing.Rules rules) { + rules + .get("/", this::books) + .get("/{id}", this::bookById); + } + + private void bookById(ServerRequest serverRequest, ServerResponse serverResponse) { + //get the book with the given id + String id = serverRequest.path().param("id"); + Book book = bookManager.get(id); + JsonObject jsonObject = from(book); + serverResponse.send(jsonObject); + } + + private void books(ServerRequest serverRequest, ServerResponse serverResponse) { + //get all books + List books = bookManager.getAll(); + JsonArray jsonArray = from(books); + serverResponse.send(jsonArray); + } + + private JsonObject from(Book book) { + JsonObject jsonObject = Json.createObjectBuilder() + .add("id", book.getId()) + .add("isbn", book.getIsbn()) + .add("name", book.getName()) + .add("author", book.getAuthor()) + .add("pages", book.getPages()) + .build(); + return jsonObject; + } + + private JsonArray from(List books) { + JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + books.forEach(book -> { + jsonArrayBuilder.add(from(book)); + }); + return jsonArrayBuilder.build(); + } +} diff --git a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/WebApplicationRouting.java b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/WebApplicationRouting.java similarity index 96% rename from helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/WebApplicationRouting.java rename to microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/WebApplicationRouting.java index 1f32d3c528..17bf2bcc8f 100644 --- a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/WebApplicationRouting.java +++ b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/routing/WebApplicationRouting.java @@ -1,29 +1,29 @@ -package com.baeldung.helidon.se.routing; - -import io.helidon.webserver.Routing; -import io.helidon.webserver.ServerConfiguration; -import io.helidon.webserver.WebServer; -import io.helidon.webserver.json.JsonSupport; - -public class WebApplicationRouting { - - public static void main(String... args) throws Exception { - - ServerConfiguration serverConfig = ServerConfiguration.builder() - .port(9080) - .build(); - - Routing routing = Routing.builder() - .register(JsonSupport.get()) - .register("/books", new BookResource()) - .get("/greet", (request, response) -> response.send("Hello World !")) - .build(); - - WebServer.create(serverConfig, routing) - .start() - .thenAccept(ws -> - System.out.println("Server started at: http://localhost:" + ws.port()) - ); - } - -} +package com.baeldung.helidon.se.routing; + +import io.helidon.webserver.Routing; +import io.helidon.webserver.ServerConfiguration; +import io.helidon.webserver.WebServer; +import io.helidon.webserver.json.JsonSupport; + +public class WebApplicationRouting { + + public static void main(String... args) throws Exception { + + ServerConfiguration serverConfig = ServerConfiguration.builder() + .port(9080) + .build(); + + Routing routing = Routing.builder() + .register(JsonSupport.get()) + .register("/books", new BookResource()) + .get("/greet", (request, response) -> response.send("Hello World !")) + .build(); + + WebServer.create(serverConfig, routing) + .start() + .thenAccept(ws -> + System.out.println("Server started at: http://localhost:" + ws.port()) + ); + } + +} diff --git a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/MyUser.java b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/MyUser.java similarity index 95% rename from helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/MyUser.java rename to microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/MyUser.java index e8009a98ad..d1a8446f6a 100644 --- a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/MyUser.java +++ b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/MyUser.java @@ -1,33 +1,33 @@ -package com.baeldung.helidon.se.security; - -import io.helidon.security.provider.httpauth.UserStore; - -import java.util.Collection; - -public class MyUser implements UserStore.User { - - private String login; - private char[] password; - private Collection roles; - - public MyUser(String login, char[] password, Collection roles) { - this.login = login; - this.password = password; - this.roles = roles; - } - - @Override - public String getLogin() { - return login; - } - - @Override - public char[] getPassword() { - return password; - } - - @Override - public Collection getRoles() { - return roles; - } -} +package com.baeldung.helidon.se.security; + +import io.helidon.security.provider.httpauth.UserStore; + +import java.util.Collection; + +public class MyUser implements UserStore.User { + + private String login; + private char[] password; + private Collection roles; + + public MyUser(String login, char[] password, Collection roles) { + this.login = login; + this.password = password; + this.roles = roles; + } + + @Override + public String getLogin() { + return login; + } + + @Override + public char[] getPassword() { + return password; + } + + @Override + public Collection getRoles() { + return roles; + } +} diff --git a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/WebApplicationSecurity.java b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/WebApplicationSecurity.java similarity index 97% rename from helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/WebApplicationSecurity.java rename to microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/WebApplicationSecurity.java index 9a67f3d716..4eb7c6c01f 100644 --- a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/WebApplicationSecurity.java +++ b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/security/WebApplicationSecurity.java @@ -1,61 +1,61 @@ -package com.baeldung.helidon.se.security; - -import io.helidon.config.Config; -import io.helidon.security.Security; -import io.helidon.security.SubjectType; -import io.helidon.security.provider.httpauth.HttpBasicAuthProvider; -import io.helidon.security.provider.httpauth.UserStore; -import io.helidon.security.webserver.WebSecurity; -import io.helidon.webserver.Routing; -import io.helidon.webserver.ServerConfiguration; -import io.helidon.webserver.WebServer; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; - -public class WebApplicationSecurity { - - public static void main(String... args) throws Exception { - - Config config = Config.create(); - ServerConfiguration serverConfig = - ServerConfiguration.fromConfig(config.get("server")); - - Map users = new HashMap<>(); - users.put("user", new MyUser("user", "user".toCharArray(), Arrays.asList("ROLE_USER"))); - users.put("admin", new MyUser("admin", "admin".toCharArray(), Arrays.asList("ROLE_USER", "ROLE_ADMIN"))); - UserStore store = user -> Optional.ofNullable(users.get(user)); - - HttpBasicAuthProvider httpBasicAuthProvider = HttpBasicAuthProvider.builder() - .realm("myRealm") - .subjectType(SubjectType.USER) - .userStore(store) - .build(); - - //1. Using Builder Pattern or Config Pattern - Security security = Security.builder() - .addAuthenticationProvider(httpBasicAuthProvider) - .build(); - //Security security = Security.fromConfig(config); - - //2. WebSecurity from Security or from Config - // WebSecurity webSecurity = WebSecurity.from(security) - // .securityDefaults(WebSecurity.authenticate()); - - WebSecurity webSecurity = WebSecurity.from(config); - - Routing routing = Routing.builder() - .register(webSecurity) - .get("/user", (request, response) -> response.send("Hello, I'm a Helidon SE user with ROLE_USER")) - .get("/admin", (request, response) -> response.send("Hello, I'm a Helidon SE user with ROLE_ADMIN")) - .build(); - - WebServer webServer = WebServer.create(serverConfig, routing); - - webServer.start().thenAccept(ws -> - System.out.println("Server started at: http://localhost:" + ws.port()) - ); - } -} +package com.baeldung.helidon.se.security; + +import io.helidon.config.Config; +import io.helidon.security.Security; +import io.helidon.security.SubjectType; +import io.helidon.security.provider.httpauth.HttpBasicAuthProvider; +import io.helidon.security.provider.httpauth.UserStore; +import io.helidon.security.webserver.WebSecurity; +import io.helidon.webserver.Routing; +import io.helidon.webserver.ServerConfiguration; +import io.helidon.webserver.WebServer; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +public class WebApplicationSecurity { + + public static void main(String... args) throws Exception { + + Config config = Config.create(); + ServerConfiguration serverConfig = + ServerConfiguration.fromConfig(config.get("server")); + + Map users = new HashMap<>(); + users.put("user", new MyUser("user", "user".toCharArray(), Arrays.asList("ROLE_USER"))); + users.put("admin", new MyUser("admin", "admin".toCharArray(), Arrays.asList("ROLE_USER", "ROLE_ADMIN"))); + UserStore store = user -> Optional.ofNullable(users.get(user)); + + HttpBasicAuthProvider httpBasicAuthProvider = HttpBasicAuthProvider.builder() + .realm("myRealm") + .subjectType(SubjectType.USER) + .userStore(store) + .build(); + + //1. Using Builder Pattern or Config Pattern + Security security = Security.builder() + .addAuthenticationProvider(httpBasicAuthProvider) + .build(); + //Security security = Security.fromConfig(config); + + //2. WebSecurity from Security or from Config + // WebSecurity webSecurity = WebSecurity.from(security) + // .securityDefaults(WebSecurity.authenticate()); + + WebSecurity webSecurity = WebSecurity.from(config); + + Routing routing = Routing.builder() + .register(webSecurity) + .get("/user", (request, response) -> response.send("Hello, I'm a Helidon SE user with ROLE_USER")) + .get("/admin", (request, response) -> response.send("Hello, I'm a Helidon SE user with ROLE_ADMIN")) + .build(); + + WebServer webServer = WebServer.create(serverConfig, routing); + + webServer.start().thenAccept(ws -> + System.out.println("Server started at: http://localhost:" + ws.port()) + ); + } +} diff --git a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/webserver/SimpleWebApplication.java b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/webserver/SimpleWebApplication.java similarity index 96% rename from helidon/helidon-se/src/main/java/com/baeldung/helidon/se/webserver/SimpleWebApplication.java rename to microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/webserver/SimpleWebApplication.java index 0a603a5123..a9a92cf1b9 100644 --- a/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/webserver/SimpleWebApplication.java +++ b/microservices-modules/helidon/helidon-se/src/main/java/com/baeldung/helidon/se/webserver/SimpleWebApplication.java @@ -1,26 +1,26 @@ -package com.baeldung.helidon.se.webserver; - -import io.helidon.webserver.Routing; -import io.helidon.webserver.ServerConfiguration; -import io.helidon.webserver.WebServer; - -public class SimpleWebApplication { - - public static void main(String... args) throws Exception { - - ServerConfiguration serverConfig = ServerConfiguration.builder() - .port(9001) - .build(); - - Routing routing = Routing.builder() - .get("/greet", (request, response) -> response.send("Hello World !")) - .build(); - - WebServer.create(serverConfig, routing) - .start() - .thenAccept(ws -> - System.out.println("Server started at: http://localhost:" + ws.port()) - ); - } - -} +package com.baeldung.helidon.se.webserver; + +import io.helidon.webserver.Routing; +import io.helidon.webserver.ServerConfiguration; +import io.helidon.webserver.WebServer; + +public class SimpleWebApplication { + + public static void main(String... args) throws Exception { + + ServerConfiguration serverConfig = ServerConfiguration.builder() + .port(9001) + .build(); + + Routing routing = Routing.builder() + .get("/greet", (request, response) -> response.send("Hello World !")) + .build(); + + WebServer.create(serverConfig, routing) + .start() + .thenAccept(ws -> + System.out.println("Server started at: http://localhost:" + ws.port()) + ); + } + +} diff --git a/helidon/helidon-se/src/main/resources/application.json b/microservices-modules/helidon/helidon-se/src/main/resources/application.json similarity index 100% rename from helidon/helidon-se/src/main/resources/application.json rename to microservices-modules/helidon/helidon-se/src/main/resources/application.json diff --git a/helidon/helidon-se/src/main/resources/application.properties b/microservices-modules/helidon/helidon-se/src/main/resources/application.properties similarity index 95% rename from helidon/helidon-se/src/main/resources/application.properties rename to microservices-modules/helidon/helidon-se/src/main/resources/application.properties index 062047de4a..2074c4a836 100644 --- a/helidon/helidon-se/src/main/resources/application.properties +++ b/microservices-modules/helidon/helidon-se/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.port=9080 -web.debug=true -web.page-size=15 +server.port=9080 +web.debug=true +web.page-size=15 user.home=C:/Users/app \ No newline at end of file diff --git a/helidon/helidon-se/src/main/resources/application.yaml b/microservices-modules/helidon/helidon-se/src/main/resources/application.yaml similarity index 100% rename from helidon/helidon-se/src/main/resources/application.yaml rename to microservices-modules/helidon/helidon-se/src/main/resources/application.yaml diff --git a/helidon/pom.xml b/microservices-modules/helidon/pom.xml similarity index 92% rename from helidon/pom.xml rename to microservices-modules/helidon/pom.xml index 36466203a8..ca2cafb7d3 100644 --- a/helidon/pom.xml +++ b/microservices-modules/helidon/pom.xml @@ -10,7 +10,7 @@ com.baeldung - parent-modules + microservices-modules 1.0.0-SNAPSHOT diff --git a/micronaut/.mvn/jvm.config b/microservices-modules/micronaut/.mvn/jvm.config similarity index 100% rename from micronaut/.mvn/jvm.config rename to microservices-modules/micronaut/.mvn/jvm.config diff --git a/micronaut/.mvn/wrapper/MavenWrapperDownloader.java b/microservices-modules/micronaut/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from micronaut/.mvn/wrapper/MavenWrapperDownloader.java rename to microservices-modules/micronaut/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/micronaut/.mvn/wrapper/maven-wrapper.properties b/microservices-modules/micronaut/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from micronaut/.mvn/wrapper/maven-wrapper.properties rename to microservices-modules/micronaut/.mvn/wrapper/maven-wrapper.properties diff --git a/micronaut/Dockerfile b/microservices-modules/micronaut/Dockerfile similarity index 100% rename from micronaut/Dockerfile rename to microservices-modules/micronaut/Dockerfile diff --git a/micronaut/README.md b/microservices-modules/micronaut/README.md similarity index 100% rename from micronaut/README.md rename to microservices-modules/micronaut/README.md diff --git a/micronaut/micronaut-cli.yml b/microservices-modules/micronaut/micronaut-cli.yml similarity index 100% rename from micronaut/micronaut-cli.yml rename to microservices-modules/micronaut/micronaut-cli.yml diff --git a/micronaut/mvnw b/microservices-modules/micronaut/mvnw old mode 100755 new mode 100644 similarity index 100% rename from micronaut/mvnw rename to microservices-modules/micronaut/mvnw diff --git a/micronaut/mvnw.cmd b/microservices-modules/micronaut/mvnw.cmd old mode 100755 new mode 100644 similarity index 97% rename from micronaut/mvnw.cmd rename to microservices-modules/micronaut/mvnw.cmd index 03d90e960b..830073a17e --- a/micronaut/mvnw.cmd +++ b/microservices-modules/micronaut/mvnw.cmd @@ -1,161 +1,161 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar" -FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - echo Found %WRAPPER_JAR% -) else ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" - echo Finished downloading %WRAPPER_JAR% -) -@REM End of extension - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar" +FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/micronaut/pom.xml b/microservices-modules/micronaut/pom.xml similarity index 99% rename from micronaut/pom.xml rename to microservices-modules/micronaut/pom.xml index a04fc5c99c..8647d1a3a7 100644 --- a/micronaut/pom.xml +++ b/microservices-modules/micronaut/pom.xml @@ -10,7 +10,7 @@ com.baeldung - parent-modules + microservices-modules 1.0.0-SNAPSHOT diff --git a/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClient.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClient.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClient.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClient.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/GreetingClient.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/GreetingClient.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/GreetingClient.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/GreetingClient.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/ServerApplication.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/ServerApplication.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/ServerApplication.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/ServerApplication.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/AsyncGreetController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/AsyncGreetController.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/AsyncGreetController.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/AsyncGreetController.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/GreetController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/GreetController.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/GreetController.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/GreetController.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/EnglishGreetingService.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/EnglishGreetingService.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/EnglishGreetingService.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/EnglishGreetingService.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/GreetingService.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/GreetingService.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/GreetingService.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/GreetingService.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/SpanishGreetingService.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/SpanishGreetingService.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/SpanishGreetingService.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/SpanishGreetingService.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClient.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClient.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClient.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClient.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java similarity index 100% rename from micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java rename to microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java diff --git a/micronaut/src/main/resources/application.yml b/microservices-modules/micronaut/src/main/resources/application.yml similarity index 100% rename from micronaut/src/main/resources/application.yml rename to microservices-modules/micronaut/src/main/resources/application.yml diff --git a/micronaut/src/main/resources/logback.xml b/microservices-modules/micronaut/src/main/resources/logback.xml similarity index 100% rename from micronaut/src/main/resources/logback.xml rename to microservices-modules/micronaut/src/main/resources/logback.xml diff --git a/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClientUnitTest.java similarity index 100% rename from micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClientUnitTest.java rename to microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClientUnitTest.java diff --git a/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/GreetingClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/GreetingClientUnitTest.java similarity index 100% rename from micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/GreetingClientUnitTest.java rename to microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/GreetingClientUnitTest.java diff --git a/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java similarity index 100% rename from micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java rename to microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java diff --git a/microprofile/README.md b/microservices-modules/microprofile/README.md similarity index 100% rename from microprofile/README.md rename to microservices-modules/microprofile/README.md diff --git a/microprofile/pom.xml b/microservices-modules/microprofile/pom.xml similarity index 98% rename from microprofile/pom.xml rename to microservices-modules/microprofile/pom.xml index 54ed3a9930..24803cb4a4 100644 --- a/microprofile/pom.xml +++ b/microservices-modules/microprofile/pom.xml @@ -10,7 +10,7 @@ com.baeldung - parent-modules + microservices-modules 1.0.0-SNAPSHOT diff --git a/microprofile/src/main/java/com/baeldung/microprofile/LibraryApplication.java b/microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/LibraryApplication.java similarity index 100% rename from microprofile/src/main/java/com/baeldung/microprofile/LibraryApplication.java rename to microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/LibraryApplication.java diff --git a/microprofile/src/main/java/com/baeldung/microprofile/model/Book.java b/microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/model/Book.java similarity index 100% rename from microprofile/src/main/java/com/baeldung/microprofile/model/Book.java rename to microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/model/Book.java diff --git a/microprofile/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java b/microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java similarity index 100% rename from microprofile/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java rename to microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java diff --git a/microprofile/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java b/microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java similarity index 100% rename from microprofile/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java rename to microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java diff --git a/microprofile/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java b/microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java similarity index 100% rename from microprofile/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java rename to microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java diff --git a/microprofile/src/main/java/com/baeldung/microprofile/repo/BookManager.java b/microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/repo/BookManager.java similarity index 100% rename from microprofile/src/main/java/com/baeldung/microprofile/repo/BookManager.java rename to microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/repo/BookManager.java diff --git a/microprofile/src/main/java/com/baeldung/microprofile/util/BookMapper.java b/microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/util/BookMapper.java similarity index 100% rename from microprofile/src/main/java/com/baeldung/microprofile/util/BookMapper.java rename to microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/util/BookMapper.java diff --git a/microprofile/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java b/microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java similarity index 100% rename from microprofile/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java rename to microservices-modules/microprofile/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java diff --git a/microprofile/src/main/liberty/config/server.xml b/microservices-modules/microprofile/src/main/liberty/config/server.xml similarity index 100% rename from microprofile/src/main/liberty/config/server.xml rename to microservices-modules/microprofile/src/main/liberty/config/server.xml diff --git a/microprofile/src/main/resources/logback.xml b/microservices-modules/microprofile/src/main/resources/logback.xml similarity index 100% rename from microprofile/src/main/resources/logback.xml rename to microservices-modules/microprofile/src/main/resources/logback.xml diff --git a/msf4j/README.md b/microservices-modules/msf4j/README.md similarity index 100% rename from msf4j/README.md rename to microservices-modules/msf4j/README.md diff --git a/msf4j/pom.xml b/microservices-modules/msf4j/pom.xml similarity index 96% rename from msf4j/pom.xml rename to microservices-modules/msf4j/pom.xml index 99e25dbcbf..642795e5fe 100644 --- a/msf4j/pom.xml +++ b/microservices-modules/msf4j/pom.xml @@ -10,7 +10,7 @@ com.baeldung - parent-modules + microservices-modules 1.0.0-SNAPSHOT diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/Application.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/Application.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4japi/Application.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/Application.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/Meal.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/Meal.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4japi/Meal.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/Meal.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/MenuService.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/MenuService.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4japi/MenuService.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4japi/MenuService.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4jintro/Application.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jintro/Application.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4jintro/Application.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jintro/Application.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4jintro/SimpleService.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jintro/SimpleService.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4jintro/SimpleService.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jintro/SimpleService.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/Application.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/Application.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/Application.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/Application.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/configuration/PortConfiguration.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/configuration/PortConfiguration.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/configuration/PortConfiguration.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/configuration/PortConfiguration.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/domain/Meal.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/domain/Meal.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/domain/Meal.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/domain/Meal.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/repositories/MealRepository.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/repositories/MealRepository.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/repositories/MealRepository.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/repositories/MealRepository.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/resources/MealResource.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/resources/MealResource.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/resources/MealResource.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/resources/MealResource.java diff --git a/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/services/MealService.java b/microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/services/MealService.java similarity index 100% rename from msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/services/MealService.java rename to microservices-modules/msf4j/src/main/java/com/baeldung/msf4j/msf4jspring/services/MealService.java diff --git a/msf4j/src/main/resources/application.properties b/microservices-modules/msf4j/src/main/resources/application.properties similarity index 100% rename from msf4j/src/main/resources/application.properties rename to microservices-modules/msf4j/src/main/resources/application.properties diff --git a/msf4j/src/main/resources/logback.xml b/microservices-modules/msf4j/src/main/resources/logback.xml similarity index 100% rename from msf4j/src/main/resources/logback.xml rename to microservices-modules/msf4j/src/main/resources/logback.xml diff --git a/msf4j/src/main/resources/templates/meals.mustache b/microservices-modules/msf4j/src/main/resources/templates/meals.mustache similarity index 100% rename from msf4j/src/main/resources/templates/meals.mustache rename to microservices-modules/msf4j/src/main/resources/templates/meals.mustache diff --git a/open-liberty/README.md b/microservices-modules/open-liberty/README.md similarity index 100% rename from open-liberty/README.md rename to microservices-modules/open-liberty/README.md diff --git a/microservices-modules/open-liberty/pom.xml b/microservices-modules/open-liberty/pom.xml new file mode 100644 index 0000000000..e7a94eab39 --- /dev/null +++ b/microservices-modules/open-liberty/pom.xml @@ -0,0 +1,127 @@ + + + 4.0.0 + com.baeldung + open-liberty + 1.0-SNAPSHOT + war + + + com.baeldung + microservices-modules + 1.0.0-SNAPSHOT + + + + + jakarta.platform + jakarta.jakartaee-web-api + ${version.jakarta.jakartaee-web-api} + provided + + + org.eclipse.microprofile + microprofile + ${version.microprofile} + pom + provided + + + org.apache.derby + derby + ${version.derby} + provided + + + + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + test + + + org.eclipse + yasson + ${version.yasson} + test + + + org.apache.cxf + cxf-rt-rs-client + ${version.cxf-rt-rs-client} + test + + + org.glassfish + javax.json + ${version.javax.json} + test + + + org.apache.cxf + cxf-rt-rs-mp-client + ${version.cxf-rt-rs-mp-client} + test + + + + + ${project.artifactId} + + + + io.openliberty.tools + liberty-maven-plugin + ${version.liberty-maven-plugin} + + + ${project.build.directory}/liberty/wlp/usr/shared/resources/ + + org.apache.derby + derby + ${version.derby} + + + + + + org.apache.maven.plugins + maven-war-plugin + ${version.maven-war-plugin} + + + + + + 1.8 + 1.8 + UTF-8 + UTF-8 + false + + 8.0.0 + 3.2 + 10.14.2.0 + 3.3-M3 + 3.2.3 + 1.0.5 + 3.2.6 + 1.0.4 + 3.3.1 + + openliberty + 9080 + 9443 + 7070 + 5.8.1 + + + \ No newline at end of file diff --git a/open-liberty/src/main/java/com/baeldung/openliberty/person/dao/PersonDao.java b/microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/person/dao/PersonDao.java similarity index 100% rename from open-liberty/src/main/java/com/baeldung/openliberty/person/dao/PersonDao.java rename to microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/person/dao/PersonDao.java diff --git a/open-liberty/src/main/java/com/baeldung/openliberty/person/model/Person.java b/microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/person/model/Person.java similarity index 100% rename from open-liberty/src/main/java/com/baeldung/openliberty/person/model/Person.java rename to microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/person/model/Person.java diff --git a/open-liberty/src/main/java/com/baeldung/openliberty/person/resource/PersonResource.java b/microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/person/resource/PersonResource.java similarity index 100% rename from open-liberty/src/main/java/com/baeldung/openliberty/person/resource/PersonResource.java rename to microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/person/resource/PersonResource.java diff --git a/open-liberty/src/main/java/com/baeldung/openliberty/rest/ApiApplication.java b/microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/rest/ApiApplication.java similarity index 100% rename from open-liberty/src/main/java/com/baeldung/openliberty/rest/ApiApplication.java rename to microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/rest/ApiApplication.java diff --git a/open-liberty/src/main/java/com/baeldung/openliberty/rest/consumes/RestConsumer.java b/microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/rest/consumes/RestConsumer.java similarity index 100% rename from open-liberty/src/main/java/com/baeldung/openliberty/rest/consumes/RestConsumer.java rename to microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/rest/consumes/RestConsumer.java diff --git a/open-liberty/src/main/java/com/baeldung/openliberty/servlet/AppServlet.java b/microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/servlet/AppServlet.java similarity index 100% rename from open-liberty/src/main/java/com/baeldung/openliberty/servlet/AppServlet.java rename to microservices-modules/open-liberty/src/main/java/com/baeldung/openliberty/servlet/AppServlet.java diff --git a/open-liberty/src/main/liberty/config/server.xml b/microservices-modules/open-liberty/src/main/liberty/config/server.xml similarity index 100% rename from open-liberty/src/main/liberty/config/server.xml rename to microservices-modules/open-liberty/src/main/liberty/config/server.xml diff --git a/open-liberty/src/main/resources/META-INF/persistence.xml b/microservices-modules/open-liberty/src/main/resources/META-INF/persistence.xml similarity index 100% rename from open-liberty/src/main/resources/META-INF/persistence.xml rename to microservices-modules/open-liberty/src/main/resources/META-INF/persistence.xml diff --git a/open-liberty/src/test/java/com/baeldung/openliberty/RestClientTest.java b/microservices-modules/open-liberty/src/test/java/com/baeldung/openliberty/RestClientLiveTest.java similarity index 96% rename from open-liberty/src/test/java/com/baeldung/openliberty/RestClientTest.java rename to microservices-modules/open-liberty/src/test/java/com/baeldung/openliberty/RestClientLiveTest.java index 4978483ca0..f328d61a57 100644 --- a/open-liberty/src/test/java/com/baeldung/openliberty/RestClientTest.java +++ b/microservices-modules/open-liberty/src/test/java/com/baeldung/openliberty/RestClientLiveTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import com.baeldung.openliberty.person.model.Person; import com.baeldung.openliberty.rest.consumes.RestConsumer; -public class RestClientTest { +public class RestClientLiveTest { private static String BASE_URL; diff --git a/microservices-modules/pom.xml b/microservices-modules/pom.xml new file mode 100644 index 0000000000..3f8eddcdb7 --- /dev/null +++ b/microservices-modules/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + microservices-modules + microservices-modules + pom + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + helidon + micronaut + microprofile + msf4j + open-liberty + + + \ No newline at end of file diff --git a/open-liberty/pom.xml b/open-liberty/pom.xml deleted file mode 100644 index df54d9f136..0000000000 --- a/open-liberty/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - 4.0.0 - com.baeldung - open-liberty - 1.0-SNAPSHOT - war - - - - jakarta.platform - jakarta.jakartaee-web-api - ${version.jakarta.jakartaee-web-api} - provided - - - org.eclipse.microprofile - microprofile - ${version.microprofile} - pom - provided - - - org.apache.derby - derby - ${version.derby} - provided - - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - - org.eclipse - yasson - ${version.yasson} - test - - - org.apache.cxf - cxf-rt-rs-client - ${version.cxf-rt-rs-client} - test - - - org.glassfish - javax.json - ${version.javax.json} - test - - - org.apache.cxf - cxf-rt-rs-mp-client - ${version.cxf-rt-rs-mp-client} - test - - - - - ${project.artifactId} - - - - io.openliberty.tools - liberty-maven-plugin - ${version.liberty-maven-plugin} - - - ${project.build.directory}/liberty/wlp/usr/shared/resources/ - - org.apache.derby - derby - ${version.derby} - - - - - - org.apache.maven.plugins - maven-war-plugin - ${version.maven-war-plugin} - - - - - - 1.8 - 1.8 - UTF-8 - UTF-8 - false - - 8.0.0 - 3.2 - 10.14.2.0 - 3.3-M3 - 3.2.3 - 1.0.5 - 3.2.6 - 1.0.4 - 3.3.1 - - openliberty - 9080 - 9443 - 7070 - 5.8.1 - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 178e852f5b..cdee542d12 100644 --- a/pom.xml +++ b/pom.xml @@ -404,7 +404,6 @@ guice hazelcast - helidon apache-httpclient httpclient-simple hystrix @@ -471,9 +470,7 @@ mesos-marathon metrics - micronaut - microprofile - msf4j + microservices-modules muleesb mustache mybatis @@ -481,7 +478,6 @@ netflix-modules netty ninja - open-liberty orika osgi @@ -826,7 +822,6 @@ guice hazelcast - helidon apache-httpclient httpclient-simple hystrix @@ -895,9 +890,7 @@ mesos-marathon metrics - micronaut - microprofile - msf4j + microservices-modules muleesb mustache mybatis @@ -905,7 +898,6 @@ netflix-modules netty ninja - open-liberty orika osgi