[WIP] Multi module build

.gitignore

@@ -1,5 +1,6 @@
 # no generated files in version control
-src/main/gen/
+**/src/main/gen/
+**/out/
 
 # private data
 /buildres/jabref-cert-2016.p12
@@ -8,7 +9,7 @@ src/main/gen/
 status.md
 
 # Install4J
-install4j6/
+install4j7/
 
 # Gradle
 # generated when `gradlew --gui` is called

.travis.yml

@@ -17,7 +17,7 @@ env:
   global:
     - GRADLE_OPTS=-Dorg.gradle.daemon=false
   matrix:
-    - TEST_SUITE=check OPTIONS=modernizer
+    - TEST_SUITE=check
     - TEST_SUITE=fetcherTest
     - TEST_SUITE=databaseTest
     - TEST_SUITE=guiTest

circle.yml

@@ -10,18 +10,19 @@ dependencies:
     # openssl aes-256-cbc -e -in ./buildres/jabref-cert-2016.p12 -out jabref-cert-2016.p12.enc -k {PASSWORD}
     #- openssl aes-256-cbc -d -in ./buildres/jabref-cert-2016.p12.enc -out ./buildres/jabref-cert-2016.p12 -k $CERTIFICATE
     - scripts/prepare-install4j.sh
-    - install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY 
+    - install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
     #--win-keystore-password $CERTIFICATE_PW --mac-keystore-password $CERTIFICATE_PW
   override:
     # We do this to decrease build time by using CircleCI's cache. See https://discuss.circleci.com/t/effective-caching-for-gradle/540 for a longer motivation.
-    - ./gradlew compileJava
+    - ./gradlew --no-daemon -Pdev=true compileJava
   cache_directories:
     - "~/.install4j7"
     - "~/downloads"
 
 test:
   override:
-    - ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
+    - ./gradlew --no-daemon -Pdev=true -Pinstall4jDir="install4j7" --stacktrace release
+    - ./gradlew --no-daemon -Drevision=release -DoutputFormatter=json -DoutputDir=build/releases dependencyUpdates
   post:
     # save test reports as build artifacts
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
@@ -33,19 +34,16 @@ deployment:
    tag: /v[0-9]+(\.[0-9]+)*(-.+)?/
    commands:
       # we have to do a clean build as changing gradle's "project.version" does not lead to a rebuild of resources (mirroring project.version)
-      - ./gradlew -Pinstall4jDir="install4j7" clean release --stacktrace
+      - ./gradlew --no-daemon -Pinstall4jDir="install4j7" --stacktrace clean release
       # upload at all circumstances
       - scripts/upload-to-builds.jabref.org.sh
-      - ./gradlew dependencyUpdates -Drevision=release -DoutputFormatter=json -DoutputDir=build/releases
   development:
      # match all branches; this is executed, if "release" is not matched - see https://circleci.com/docs/configuration/
     branch: /.*/
     commands:
       # if upload fails, it is accepted; CircleCI provides deep links to the binaries as fallback
       - timeout 580 scripts/upload-to-builds.jabref.org.sh || exit 0
 
-
-
 general:
   artifacts:
     - "build/releases"

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip

jabref.install4j

@@ -59,8 +59,8 @@
     <components />
   </files>
   <launchers>
-    <launcher name="JabRef" id="23" customizedId="" external="false" excludeFromMenu="false" unixMode="755" unixAutoStart="true" menuName="" icnsFile="./src/main/resources/icons/jabref.icns" customMacBundleIdentifier="false" macBundleIdentifier="" swtApp="false" fileset="" macBundleBinary="JavaApplicationStub" addMacEntitlements="false" macEntitlementsFile="" useCustomMacosExecutableName="false" customMacosExecutableName="" useJavaMinVersionOverride="false" javaMinVersionOverride="" useJavaMaxVersionOverride="false" javaMaxVersionOverride="" checkUpdater="false" updateExecutionMode="unattendedProgress" unattendedUpdateTitle="${i18n:updater.WindowTitle(&quot;${compiler:sys.fullName}&quot;)}">
-      <executable name="JabRef" type="1" iconSet="true" iconFile="./src/main/resources/icons/jabref.ico" executableDir="" redirectStderr="true" stderrFile="error.log" stderrMode="overwrite" redirectStdout="false" stdoutFile="output.log" stdoutMode="overwrite" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="false" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="" executionLevel="asInvoker" checkConsoleParameter="true" globalSingleInstance="false" singleInstanceActivate="true" dpiAware="false">
+    <launcher name="JabRef" id="23" customizedId="" external="false" excludeFromMenu="false" unixMode="755" unixAutoStart="true" menuName="" icnsFile="./buildres/jabref.icns" customMacBundleIdentifier="false" macBundleIdentifier="" swtApp="false" fileset="" macBundleBinary="JavaApplicationStub" addMacEntitlements="false" macEntitlementsFile="" useCustomMacosExecutableName="false" customMacosExecutableName="" useJavaMinVersionOverride="false" javaMinVersionOverride="" useJavaMaxVersionOverride="false" javaMaxVersionOverride="" checkUpdater="false" updateExecutionMode="unattendedProgress" unattendedUpdateTitle="${i18n:updater.WindowTitle(&quot;${compiler:sys.fullName}&quot;)}">
+      <executable name="JabRef" type="1" iconSet="true" iconFile="./buildres/jabref.ico" executableDir="" redirectStderr="true" stderrFile="error.log" stderrMode="overwrite" redirectStdout="false" stdoutFile="output.log" stdoutMode="overwrite" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="false" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="" executionLevel="asInvoker" checkConsoleParameter="true" globalSingleInstance="false" singleInstanceActivate="true" dpiAware="false">
         <versionInfo include="true" fileVersion="${compiler:versionFourDots}" fileDescription="${compiler:sys.fullName}" legalCopyright="${compiler:sys.fullName}" internalName="${compiler:sys.fullName}" productName="" />
       </executable>
       <splashScreen show="false" width="0" height="0" bitmapFile="" textOverlay="false">
@@ -102,7 +102,7 @@
       <customAttributes />
     </autoUpdate>
     <applications>
-      <application name="" id="installer" customizedId="" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="none" styleId="" fileset="" customIcnsFile="./src/main/resources/icons/jabref.icns" customIcoFile="./src/main/resources/icons/jabref.ico" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true">
+      <application name="" id="installer" customizedId="" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="none" styleId="" fileset="" customIcnsFile="./buildres/jabref.icns" customIcoFile="./buildres/jabref.ico" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true">
         <serializedBean>
           <java class="java.beans.XMLDecoder">
             <object class="com.install4j.runtime.beans.applications.InstallerApplication">
@@ -183,7 +183,7 @@
     context.setInstallationDirectory(new File(System.getenv("LOCALAPPDATA"), "JabRef"));
   } else {
     context.setInstallationDirectory(new File(System.getProperty("user.home"), "JabRef"));
-  }   
+  }
 }
 return true;</string>
                           </void>
@@ -608,7 +608,7 @@ return console.askOkCancel(message, true);
                       </void>
                       <void property="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>./src/main/resources/icons/jabref.icns</string>
+                          <string>./buildres/jabref.icns</string>
                         </object>
                       </void>
                       <void property="macRole">
@@ -622,7 +622,7 @@ return console.askOkCancel(message, true);
                       </void>
                       <void property="windowsIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>./src/main/resources/icons/jabref.ico</string>
+                          <string>./buildres/jabref.ico</string>
                         </object>
                       </void>
                     </object>

org.jabref.cli.xmp/build.gradle

@@ -0,0 +1,6 @@
+dependencies {
+    compile project(':org.jabref.model')
+    compile project(':org.jabref.logic')
+
+    compile 'org.apache.pdfbox:jempbox:1.8.13'
+}

org.jabref.cli.xmp/config/checkstyle/checkstyle.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+    <module name="Header">
+        <property name="header" value=""/>
+    </module>
+
+    <module name="TreeWalker">
+
+        <module name="UnusedImports"/>
+
+        <module name="RedundantImport"/>
+
+        <module name="AvoidStarImport"/>
+
+        <module name="IllegalImport"/>
+
+        <module name="ImportOrder">
+            <property name="groups" value="java,javax,javafx,org.jabref,*"/>
+            <property name="ordered" value="true"/>
+            <property name="separated" value="true"/>
+            <property name="option" value="bottom"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+
+        <module name="EmptyLineSeparator">
+            <property name="tokens"
+                      value="IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF"/>
+            <property name="allowMultipleEmptyLines" value="false"/>
+            <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
+        </module>
+
+        <module name="DeclarationOrder"/>
+
+        <!-- RCULRY causes issues if classes are nested within arrays, therefore not activated -->
+        <module name="WhitespaceAround">
+            <property name="tokens"
+                      value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV,
+                      DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+                      LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
+                      LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL,
+                      PLUS, PLUS_ASSIGN, QUESTION,
+                      SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
+        </module>
+
+        <module name="ConstantName">
+            <property name="format" value="^log(ger)?|[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
+        </module>
+    </module>
+
+    <module name="SuppressionFilter">
+        <property name="file" value="config/checkstyle/suppressions.xml"/>
+    </module>
+</module>

org.jabref.cli.xmp/config/checkstyle/suppressions.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+    <suppress checks="[a-zA-Z0-9]*" files="[\\/]gen[\\/]" />
+    <suppress checks="[a-zA-Z0-9]*" files="[\\/]test[\\/]" />
+</suppressions>

org.jabref.cli.xmp/settings.gradle

@@ -0,0 +1 @@
+include 'org.jabref.model', 'org.jabref.logic'

src/main/java/org/jabref/cli/XMPUtilMain.java → org.jabref.cli.xmp/src/main/java/org/jabref/cli/XmpUtilMain.java

@@ -6,29 +6,33 @@
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import javax.xml.transform.TransformerException;
 
-import org.jabref.Globals;
 import org.jabref.logic.bibtex.BibEntryWriter;
+import org.jabref.logic.bibtex.FieldContentParserPreferences;
 import org.jabref.logic.bibtex.LatexFieldFormatter;
+import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.xmp.XMPPreferences;
 import org.jabref.logic.xmp.XMPUtil;
+import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.JabRefPreferences;
+import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.jempbox.impl.XMLUtil;
 import org.apache.jempbox.xmp.XMPMetadata;
 
-public class XMPUtilMain {
+public class XmpUtilMain {
 
-    private XMPUtilMain() {
+    private XmpUtilMain() {
     }
 
     /**
@@ -56,27 +60,27 @@ private XMPUtilMain() {
      *             If the given BibEntry is malformed.
      */
     public static void main(String[] args) throws IOException, TransformerException {
-
-        // Don't forget to initialize the preferences
-        if (Globals.prefs == null) {
-            Globals.prefs = JabRefPreferences.getInstance();
-        }
-
-        XMPPreferences xmpPreferences = Globals.prefs.getXMPPreferences();
-        ImportFormatPreferences importFormatPreferences = Globals.prefs.getImportFormatPreferences();
+        final ImportFormatPreferences importFormatPreferences = new ImportFormatPreferences(
+                Collections.emptySet(),
+                StandardCharsets.UTF_8,
+                ',',
+                new BibtexKeyPatternPreferences("", "", false, true, true, GlobalBibtexKeyPattern.fromPattern("[auth][year]"), ','),
+                new FieldContentParserPreferences(),
+                false);
+        final BibtexParser bibtexParser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        final XMPPreferences xmpPreferences = new XMPPreferences(false, Collections.emptyList(), ';');
 
         switch (args.length) {
         case 0:
             usage();
             break;
         case 1:
-
             if (args[0].endsWith(".pdf")) {
                 // Read from pdf and write as BibTex
                 List<BibEntry> l = XMPUtil.readXMP(new File(args[0]), xmpPreferences);
 
                 BibEntryWriter bibtexEntryWriter = new BibEntryWriter(
-                        new LatexFieldFormatter(Globals.prefs.getLatexFieldFormatterPreferences()), false);
+                        new LatexFieldFormatter(new LatexFieldFormatterPreferences()), false);
 
                 for (BibEntry entry : l) {
                     StringWriter sw = new StringWriter();
@@ -87,7 +91,7 @@ public static void main(String[] args) throws IOException, TransformerException
             } else if (args[0].endsWith(".bib")) {
                 // Read from BIB and write as XMP
                 try (FileReader fr = new FileReader(args[0])) {
-                    ParserResult result = new BibtexParser(importFormatPreferences, Globals.getFileUpdateMonitor()).parse(fr);
+                    ParserResult result = bibtexParser.parse(fr);
                     Collection<BibEntry> entries = result.getDatabase().getEntries();
 
                     if (entries.isEmpty()) {
@@ -114,7 +118,7 @@ public static void main(String[] args) throws IOException, TransformerException
             }
 
             if (args[0].endsWith(".bib") && args[1].endsWith(".pdf")) {
-                ParserResult result = new BibtexParser(importFormatPreferences, Globals.getFileUpdateMonitor()).parse(new FileReader(args[0]));
+                ParserResult result = bibtexParser.parse(new FileReader(args[0]));
 
                 Collection<BibEntry> entries = result.getDatabase().getEntries();
 
@@ -135,7 +139,7 @@ public static void main(String[] args) throws IOException, TransformerException
                 break;
             }
 
-            ParserResult result = new BibtexParser(importFormatPreferences, Globals.getFileUpdateMonitor()).parse(new FileReader(args[1]));
+            ParserResult result = bibtexParser.parse(new FileReader(args[1]));
 
             Optional<BibEntry> bibEntry = result.getDatabase().getEntryByKey(args[0]);
 
@@ -155,8 +159,6 @@ public static void main(String[] args) throws IOException, TransformerException
 
     /**
      * Print usage information for the command line tool xmpUtil.
-     *
-     * @see XMPUtilMain#main(String[])
      */
     private static void usage() {
         System.out.println("Read or write XMP-metadata from or to pdf file.");