Merge branch 'trunk' of git@ashardalon.com:inflexion.git into trunkHEADtrunk

5 files changed, 78 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index 84273ad..0f82477 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ HTML/
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /target/
+.settings
diff --git a/pom.xml b/pom.xml
index 3470069..7a5ba75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
 
 	<properties>
 		<main.class>bjc.inflexion.examples.InflexionTester</main.class>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<licenses>
@@ -30,6 +31,23 @@
 	<build>
 		<plugins>
 			<plugin>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.7.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.wagon</groupId>
+                        <artifactId>wagon-webdav-jackrabbit</artifactId>
+                        <version>3.5.3</version>
+                    </dependency>
+                </dependencies>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>3.0.0</version>
+			</plugin>
+
+			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 
 				<configuration>
@@ -103,4 +121,56 @@
 			<version>4.12</version>
 		</dependency>
 	</dependencies>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.4.0</version>
+				<configuration></configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.1</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-changes-plugin</artifactId>
+				<version>2.12.1</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-changelog-plugin</artifactId>
+				<version>2.3</version>
+			</plugin>
+		</plugins>
+	</reporting>
+
+	<distributionManagement>
+        <site>
+            <id>ashardalon-dav</id>
+            <url>dav:https://ashardalon.com/projects/inflexion</url>
+        </site>
+        <snapshotRepository>
+			<id>ashardalon</id>
+            <name>Ashardalon Snapshots</name>
+			<url>https://repo.ashardalon.com/snapshots</url>
+        </snapshotRepository>
+		<repository>
+			<id>ashardalon</id>
+            <name>Ashardalon Releases</name>
+			<url>https://repo.ashardalon.com/releases</url>
+		</repository>
+	</distributionManagement>
+    <repositories>
+        <repository>
+            <id>ashardalon-forge</id>
+            <name>Ashardalon Forge</name>
+            <url>https://repo.ashardalon.com</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>
diff --git a/src/examples/java/bjc/inflexion/examples/InflexionTester.java b/src/examples/java/bjc/inflexion/examples/InflexionTester.java
index 5ca1378..12513d0 100644
--- a/src/examples/java/bjc/inflexion/examples/InflexionTester.java
+++ b/src/examples/java/bjc/inflexion/examples/InflexionTester.java
@@ -27,7 +27,7 @@ import java.util.Scanner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+//import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 
 import bjc.inflexion.InflectionML;
 import bjc.inflexion.nouns.Nouns;
@@ -79,6 +79,7 @@ public class InflexionTester {
 		}
 	}
 
+
 	@SuppressWarnings("unused")
 	private static void wikitest(final Scanner scn, final Nouns nounDB) {
 		System.out.print("Enter name of dump file: ");
@@ -88,7 +89,8 @@ public class InflexionTester {
 		try (InputStream compressedStream = new FileInputStream(fname)) {
 			// both managed by above stream
 			@SuppressWarnings("resource")
-			final InputStream stream = new BZip2CompressorInputStream(compressedStream);
+			// final InputStream stream = new BZip2CompressorInputStream(compressedStream);
+            final InputStream stream = new FileInputStream("");
 			@SuppressWarnings("resource")
 			final BufferedReader reader
 					= new BufferedReader(new InputStreamReader(stream));
@@ -266,4 +268,4 @@ public class InflexionTester {
 			ioex.printStackTrace();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 8520818..c195d5e 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -21,7 +21,5 @@ module inflexion {
 	exports bjc.inflexion.nouns;
 	exports bjc.inflexion.examples;
 	exports bjc.inflexion;
-
 	requires junit;
-	requires org.apache.commons.compress;
-}
\ No newline at end of file
+}
diff --git a/src/test/java/bjc/inflexion/InflectionMLTest.java b/src/test/java/bjc/inflexion/InflectionMLTest.java
index aba3e28..df63670 100644
--- a/src/test/java/bjc/inflexion/InflectionMLTest.java
+++ b/src/test/java/bjc/inflexion/InflectionMLTest.java
@@ -118,7 +118,7 @@ public class InflectionMLTest {
 	/**
 	 * Test compiled inflection markup.
 	 */
-//	@Test
+	//@Test
 	public void testCompiledML() {
 		assertCInflects("test literal string", pair("test literal string"));