From f89232dd213d8ed73d4ce409b17d560ee20ff1eb Mon Sep 17 00:00:00 2001 From: Yavuz Tas Date: Mon, 21 Oct 2019 15:31:19 +0200 Subject: [PATCH] sync with upstream/master --- annotations/README.md | 7 ++++++- osgi/README.md | 17 ++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/annotations/README.md b/annotations/README.md index 2b052803e6..ec4005fc5e 100644 --- a/annotations/README.md +++ b/annotations/README.md @@ -1,2 +1,7 @@ +## Annotations + +This module contains articles about Java annotations + ### Relevant Articles: -- [Java Annotation Processing and Creating a Builder](http://www.baeldung.com/java-annotation-processing-builder) + +- [Java Annotation Processing and Creating a Builder](https://www.baeldung.com/java-annotation-processing-builder) diff --git a/osgi/README.md b/osgi/README.md index ec355c9773..732f624302 100644 --- a/osgi/README.md +++ b/osgi/README.md @@ -17,9 +17,9 @@ Apache Felix ### Start -Download Apache Felix Framework Distribution +Download Apache Felix Framework Distribution from -org.apache.felix.main.distribution-5.6.8 +org.apache.felix.main.distribution-5.6.8 No! The Apache Karaf container is best. Download it from: @@ -33,12 +33,12 @@ Then run Unzip, pay attention to the files not being clipped(!). - system:exit - + system:exit + exit! shutdown -h - + or `^D` ### clean start @@ -69,7 +69,7 @@ can be logged to console ### Bundle deploy bundle:install mvn:com.baeldung/osgi-intro-sample-activator/1.0-SNAPSHOT - + install mvn:com.baeldung/osgi-intro-sample-service/1.0-SNAPSHOT install mvn:com.baeldung/osgi-intro-sample-client/1.0-SNAPSHOT @@ -88,4 +88,7 @@ Oxygen.1 Wed, 6 Sep 2017 -- 17:00 (-0400) org.eclipse.osgi_3.12.1.v20170821-1548.jar - = = NOT GOOD = = + = = NOT GOOD = = + + +