From a314b80ec098b72fda723b1f5dff24e487f89dd9 Mon Sep 17 00:00:00 2001
From: Dan Klco <dklco@apache.org>
Date: Fri, 24 Aug 2018 13:44:01 -0400
Subject: [PATCH 1/4] Adding OSGi bundle support

---
 flexmark-bundle/pom.xml                       | 217 ++++++++++++++++++
 .../src/main/javadoc/overview.html            |   9 +
 flexmark-bundle/src/main/javadoc/overview.md  |   4 +
 pom.xml                                       |   1 +
 4 files changed, 231 insertions(+)
 create mode 100644 flexmark-bundle/pom.xml
 create mode 100644 flexmark-bundle/src/main/javadoc/overview.html
 create mode 100644 flexmark-bundle/src/main/javadoc/overview.md

diff --git a/flexmark-bundle/pom.xml b/flexmark-bundle/pom.xml
new file mode 100644
index 0000000000..e389347301
--- /dev/null
+++ b/flexmark-bundle/pom.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.vladsch.flexmark</groupId>
+		<artifactId>flexmark-java</artifactId>
+		<version>0.34.20</version>
+	</parent>
+
+	<artifactId>flexmark-bundle</artifactId>
+	<name>flexmark-bundle</name>
+	<packaging>bundle</packaging>
+	<description>flexmark-java core and all extension modules and converters</description>
+
+	<!-- NOTE: These dependency declarations are only required to sort this 
+		project to the end of the line in the multimodule build. -->
+	<dependencies>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-abbreviation</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-admonition</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-anchorlink</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-aside</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-attributes</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-autolink</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-definition</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-emoji</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-enumerated-reference</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-escaped-character</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-footnotes</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-gfm-issues</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-gfm-strikethrough</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-gfm-tables</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-gfm-tasklist</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-gfm-users</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-jekyll-front-matter</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-jekyll-tag</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-media-tags</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-ins</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-xwiki-macros</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-superscript</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-tables</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-toc</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-typographic</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-wikilink</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-yaml-front-matter</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-youtube-embedded</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-formatter</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-html-parser</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-jira-converter</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-profile-pegdown</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-util</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-youtrack-converter</artifactId>
+			<version>0.34.20</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>3.5.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>!*.internal,!*.test,com.vladsch.flexmark.*</Export-Package>
+						<Private-Package>org.nibor.autolink.*;-split-package:=merge-first</Private-Package>
+						<Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+						<Import-Package>!com.vladsch.flexmark.test,*</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/flexmark-bundle/src/main/javadoc/overview.html b/flexmark-bundle/src/main/javadoc/overview.html
new file mode 100644
index 0000000000..93e833ce73
--- /dev/null
+++ b/flexmark-bundle/src/main/javadoc/overview.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+<body>
+<p><strong>flexmark-bundle core and extensions</strong></p>
+<p>flexmark-java core bundle, all extension modules and converter modules except PDF converter in the OSGi Bundle format</p>
+</body>
+</html>
diff --git a/flexmark-bundle/src/main/javadoc/overview.md b/flexmark-bundle/src/main/javadoc/overview.md
new file mode 100644
index 0000000000..e589659cd8
--- /dev/null
+++ b/flexmark-bundle/src/main/javadoc/overview.md
@@ -0,0 +1,4 @@
+**flexmark-bundle core and extensions**
+
+flexmark-java core, all extension modules and converter modules except PDF converter in the OSGi Bundle format
+
diff --git a/pom.xml b/pom.xml
index c9fda99a58..8c507e8d41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
     <modules>
         <module>flexmark</module>
         <module>flexmark-all</module>
+        <module>flexmark-bundle</module>
         <module>flexmark-docx-converter</module>
         <module>flexmark-ext-abbreviation</module>
         <module>flexmark-ext-admonition</module>

From 16cfcb3c569ee823e412f6d4108e733bd87f238b Mon Sep 17 00:00:00 2001
From: Dan Klco <dan.klco@perficient.com>
Date: Fri, 24 Aug 2018 14:34:58 -0400
Subject: [PATCH 2/4] Renaming to flexmark-osgi

---
 flexmark-bundle/src/main/javadoc/overview.md                | 4 ----
 {flexmark-bundle => flexmark-osgi}/pom.xml                  | 6 +++---
 .../src/main/javadoc/overview.html                          | 0
 flexmark-osgi/src/main/javadoc/overview.md                  | 4 ++++
 4 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 flexmark-bundle/src/main/javadoc/overview.md
 rename {flexmark-bundle => flexmark-osgi}/pom.xml (96%)
 rename {flexmark-bundle => flexmark-osgi}/src/main/javadoc/overview.html (100%)
 create mode 100644 flexmark-osgi/src/main/javadoc/overview.md

diff --git a/flexmark-bundle/src/main/javadoc/overview.md b/flexmark-bundle/src/main/javadoc/overview.md
deleted file mode 100644
index e589659cd8..0000000000
--- a/flexmark-bundle/src/main/javadoc/overview.md
+++ /dev/null
@@ -1,4 +0,0 @@
-**flexmark-bundle core and extensions**
-
-flexmark-java core, all extension modules and converter modules except PDF converter in the OSGi Bundle format
-
diff --git a/flexmark-bundle/pom.xml b/flexmark-osgi/pom.xml
similarity index 96%
rename from flexmark-bundle/pom.xml
rename to flexmark-osgi/pom.xml
index e389347301..b8349f6919 100644
--- a/flexmark-bundle/pom.xml
+++ b/flexmark-osgi/pom.xml
@@ -10,10 +10,10 @@
 		<version>0.34.20</version>
 	</parent>
 
-	<artifactId>flexmark-bundle</artifactId>
-	<name>flexmark-bundle</name>
+	<artifactId>flexmark-osgi</artifactId>
+	<name>flexmark-osgi</name>
 	<packaging>bundle</packaging>
-	<description>flexmark-java core and all extension modules and converters</description>
+	<description>flexmark-java core osgi bundle, all extension modules and converter modules except PDF converter in the OSGi Bundle format</description>
 
 	<!-- NOTE: These dependency declarations are only required to sort this 
 		project to the end of the line in the multimodule build. -->
diff --git a/flexmark-bundle/src/main/javadoc/overview.html b/flexmark-osgi/src/main/javadoc/overview.html
similarity index 100%
rename from flexmark-bundle/src/main/javadoc/overview.html
rename to flexmark-osgi/src/main/javadoc/overview.html
diff --git a/flexmark-osgi/src/main/javadoc/overview.md b/flexmark-osgi/src/main/javadoc/overview.md
new file mode 100644
index 0000000000..6a99827c10
--- /dev/null
+++ b/flexmark-osgi/src/main/javadoc/overview.md
@@ -0,0 +1,4 @@
+**flexmark-osgi core and extensions**
+
+flexmark-java core osgi bundle, all extension modules and converter modules except PDF converter in the OSGi Bundle format
+

From 12a7cd933ddfab03ef244814fe4f51db0008b708 Mon Sep 17 00:00:00 2001
From: Dan Klco <dan.klco@perficient.com>
Date: Fri, 24 Aug 2018 14:42:40 -0400
Subject: [PATCH 3/4] Miss on the renaming

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8c507e8d41..82d1a417fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <modules>
         <module>flexmark</module>
         <module>flexmark-all</module>
-        <module>flexmark-bundle</module>
+        <module>flexmark-osgi</module>
         <module>flexmark-docx-converter</module>
         <module>flexmark-ext-abbreviation</module>
         <module>flexmark-ext-admonition</module>

From d852cfb1a583b0c5895b500eeb30b098f8fa9f19 Mon Sep 17 00:00:00 2001
From: Dan Klco <dan.klco@perficient.com>
Date: Sun, 26 Aug 2018 10:30:00 -0400
Subject: [PATCH 4/4] Updating to use the project version variable instead of
 having a version for each dependency

---
 flexmark-osgi/pom.xml | 70 +++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/flexmark-osgi/pom.xml b/flexmark-osgi/pom.xml
index b8349f6919..9a6751b852 100644
--- a/flexmark-osgi/pom.xml
+++ b/flexmark-osgi/pom.xml
@@ -21,177 +21,177 @@
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-abbreviation</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-admonition</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-anchorlink</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-aside</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-attributes</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-autolink</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-definition</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-emoji</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-enumerated-reference</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-escaped-character</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-footnotes</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-gfm-issues</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-gfm-strikethrough</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-gfm-tables</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-gfm-tasklist</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-gfm-users</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-jekyll-front-matter</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-jekyll-tag</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-media-tags</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-ins</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-xwiki-macros</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-superscript</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-tables</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-toc</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-typographic</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-wikilink</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-yaml-front-matter</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-ext-youtube-embedded</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-formatter</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-html-parser</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-jira-converter</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-profile-pegdown</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-util</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
 			<artifactId>flexmark-youtrack-converter</artifactId>
-			<version>0.34.20</version>
+			<version>${project.version}</version>
 		</dependency>
 
 	</dependencies>