Simplify directory structure and prepare upload to Maven Central

Author: koppor

java-diff-utils-lib/.editorconfig renamed to .editorconfig

@@ -1,6 +1,6 @@
 # java-diff-utils [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils)
 
-> A library is for computing diffs, applying patches, generation side-by-side view in Java.
+> A library for computing diffs, applying patches, generation side-by-side view in Java.
 
 `java-diff-utils` is an open source library for performing comparison operations between chunks of text: computing diffs, applying patches, generating unified diffs or parsing them, generating diff output for easy future display (like a side-by-side view) and so on.
 

README.md

@@ -1,29 +1,114 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.novoda:bintray-release:0.4.0' // clean build uploadLib -PdryRun=false
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+group = 'io.github.java-diff-utils'
+archivesBaseName = 'java-diff-utils'
+version = '2.2.0-SNAPSHOT'
+
+sourceCompatibility = '1.7'
+targetCompatibility = '1.7'
+
+dependencies {
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version:'3.0.0'
+    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
+    testCompile group: 'junit', name: 'junit', version:'4.12'
+}
+
+compileJava {
+    // files are all encoded using UTF-8
+    options.encoding = 'UTF-8'
+}
+
+compileTestJava {
+    // files are all encoded using UTF-8
+    options.encoding = 'UTF-8'
+}
+
+javadoc {
+    failOnError = false
+    options {
+        // files are all encoded using UTF-8
+        encoding = 'UTF-8'
+        version = true
+        author = true
     }
 }
 
-ext {
-    if (file("private.properties").exists()) {
-        Properties props = new Properties()
-        props.load(new FileInputStream(file("private.properties")))
-        BINTRAY_KEY = props.getProperty('BINTRAY_KEY')
-    } else {
-        BINTRAY_KEY = ""
+jar {
+    manifest {
+        attributes('Automatic-Module-Name': 'io.github.adr.embedded')
     }
 }
 
-task uploadLib {
-    dependsOn ':java-diff-utils-lib:bintrayUpload'
+repositories {
+    jcenter()
 }
 
-allprojects {
+tasks.withType(Javadoc) {
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
+signing {
+    sign configurations.archives
+}
+
+uploadArchives {
     repositories {
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-        maven { url "http://repo.maven.apache.org/maven2" }
+        mavenDeployer {
+            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                authentication(userName: ossrhUsername, password: ossrhPassword)
+            }
+
+            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+                authentication(userName: ossrhUsername, password: ossrhPassword)
+            }
+
+            pom.project {
+                name 'Java Diff Utils'
+                packaging 'jar'
+                // optionally artifactId can be defined here
+                description 'A library for computing diffs, applying patches, generation side-by-side view in Java'
+                url 'https://github.com/java-diff-utils/java-diff-utils'
+
+                scm {
+                    connection 'scm:git:https://github.com/java-diff-utils/java-diff-utils.git'
+                    developerConnection 'scm:git:github.com:java-diff-utils/java-diff-utils.git'
+                    url 'https://github.com/java-diff-utils/java-diff-utils/tree/master'
+                }
+
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 1.1'
+                        url 'http://www.apache.org/licenses/LICENSE-1.1'
+                    }
+                }
+
+                developers {
+                    developer {
+                        id 'koppor'
+                        name 'Oliver Kopp'
+                        email '[email protected]'
+                    }
+                }
+            }
+        }
     }
 }

build.gradle

@@ -0,0 +1,6 @@
+signing.keyId=
+signing.password=
+signing.secretKeyRingFile=
+
+ossrhUsername=
+ossrhPassword=

gradle.properties

@@ -1,86 +1,86 @@
-/*
- * SPDX-License-Identifier: Apache-1.1
- *
- * ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation.
- * Copyright (c) 2010 Dmitry Naumenko ([email protected])
- * Copyright (c) 2015-2016 Brenden Kromhout and contributors to java-diff-utils
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowledgement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgement may appear in the software itself,
- *    if and wherever such third-party acknowledgements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact [email protected].
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-package difflib;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-/**
- * @author mksenzov
- * @param <?> The type of the compared elements in the 'lines'.
- */
-public class DeltaComparator implements Comparator<Delta<?>>, Serializable {
-    private static final long serialVersionUID = 1L;
-    public static final Comparator<Delta<?>> INSTANCE = new DeltaComparator();
-
-    private DeltaComparator() {
-    }
-
-    public int compare(final Delta<?> a, final Delta<?> b) {
-        final int posA = a.getOriginal().getPosition();
-        final int posB = b.getOriginal().getPosition();
-        if (posA > posB) {
-            return 1;
-        } else if (posA < posB) {
-            return -1;
-        }
-        return 0;
-    }
-}
+/*
+ * SPDX-License-Identifier: Apache-1.1
+ *
+ * ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2003 The Apache Software Foundation.
+ * Copyright (c) 2010 Dmitry Naumenko ([email protected])
+ * Copyright (c) 2015-2016 Brenden Kromhout and contributors to java-diff-utils
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowledgement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgement may appear in the software itself,
+ *    if and wherever such third-party acknowledgements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact [email protected].
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package difflib;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+/**
+ * @author mksenzov
+ * @param <?> The type of the compared elements in the 'lines'.
+ */
+public class DeltaComparator implements Comparator<Delta<?>>, Serializable {
+    private static final long serialVersionUID = 1L;
+    public static final Comparator<Delta<?>> INSTANCE = new DeltaComparator();
+
+    private DeltaComparator() {
+    }
+
+    public int compare(final Delta<?> a, final Delta<?> b) {
+        final int posA = a.getOriginal().getPosition();
+        final int posB = b.getOriginal().getPosition();
+        if (posA > posB) {
+            return 1;
+        } else if (posA < posB) {
+            return -1;
+        }
+        return 0;
+    }
+}