Merge pull request #8 from gaborbata/jackson-xml

Replaced JAXB with Jackson XML
gaborbata · Jan 10, 2018 · c74c31f · c74c31f
2 parents 53515d5 + 75ab4ae
commit c74c31f
Show file tree

Hide file tree

Showing 41 changed files with 302 additions and 329 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,115 @@
+Copyright (c) 2009-2018 Gabor Bata
+
+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 name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS 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 AUTHOR 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 includes MicroCrypt 0.3, covered by the following license:
+
+Copyright (c) 2007 Timm Knape
+
+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. Neither the name of Timm Knape nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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 includes SpringUtilities, covered by the following license:
+
+Copyright (c) 1995-2008 Sun Microsystems, Inc.
+
+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. Neither the name of Sun Microsystems nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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 uses icons from the Silk icon set by Mark James
+http://www.famfamfam.com/lab/icons/silk/
+
+The Silk icon set is licensed under a
+Creative Commons Attribution 2.5 License
+http://creativecommons.org/licenses/by/2.5/
+
+---
+
+This software uses icons from the Tango base icon theme
+http://tango.freedesktop.org/Tango_Desktop_Project
+
+The Tango base icon theme is licensed under the
+Creative Commons Attribution Share-Alike license
+http://creativecommons.org/licenses/by-sa/2.5/
+
+---
+
+This software includes Jackson JSON processor databind module, licensed under
+the Apache (Software) License, version 2.0 ("the License"). See the License
+for details about distribution rights, and the specific rights regarding
+derivate works.
+
+You may obtain a copy of the License at:
+http://www.apache.org/licenses/LICENSE-2.0
diff --git a/README.md b/README.md
@@ -17,10 +17,10 @@ Features:
 
 Usage
 -----
-Java 6 or later is recommended to run JPass. Most platforms have a mechanism to execute `.jar` files (e.g. double click the `jpass-0.1.16-SNAPSHOT.jar`).
+Java 6 or later is recommended to run JPass. Most platforms have a mechanism to execute `.jar` files (e.g. double click the `jpass-0.1.16-RELEASE.jar`).
 You can also run the application from the command line by typing (the password file is optional):
 
-    java -jar jpass-0.1.16-SNAPSHOT.jar [password_file]
+    java -jar jpass-0.1.16-RELEASE.jar [password_file]
 
 Download
 --------
@@ -42,61 +42,3 @@ Default configurations can be overridden in `jpass.properties` file:
 | clear.clipboard.on.exit.enabled    | boolean    | false         |
 | default.password.generation.length | integer    | 14            |
 | fetch.favicons.enabled             | boolean    | false         |
-
-License
--------
-Copyright (c) 2009-2017 Gabor Bata
-
-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 name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS 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 AUTHOR 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 includes MicroCrypt 0.3, covered by the following license:
-
-Copyright (c) 2007 Timm Knape
-
-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. Neither the name of Timm Knape nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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 includes SpringUtilities, covered by the following license:
-
-Copyright (c) 1995-2008 Sun Microsystems, Inc.
-
-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. Neither the name of Sun Microsystems nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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 uses icons from the [Silk icon set by Mark James](http://www.famfamfam.com/lab/icons/silk/).
-
-The Silk icon set is licensed under a [Creative Commons Attribution 2.5 License](http://creativecommons.org/licenses/by/2.5/).
-
----
-
-This software uses icons from the [Tango base icon theme](http://tango.freedesktop.org/Tango_Desktop_Project).
-
-The Tango base icon theme is licensed under the [Creative Commons Attribution Share-Alike license](http://creativecommons.org/licenses/by-sa/2.5/).
diff --git a/build.gradle b/build.gradle
@@ -10,15 +10,20 @@ repositories {
 }
 
 dependencies {
+    compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: '2.9.3'
     testCompile 'junit:junit:4.11'
 }
 
 jar {
     baseName = 'jpass'
-    version = '0.1.16-SNAPSHOT'
+    version = '0.1.16-RELEASE'
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes('Main-Class': 'jpass.JPass')
     }
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
 }
 
 task copyConfig(type: Copy) {

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,9 @@ organization:= "jpass.id"
 
 name := "JPass"
 
-version := "0.1.16-SNAPSHOT"
+version := "0.1.16-RELEASE"
+
+libraryDependencies += "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.3"
 
 libraryDependencies += "junit" % "junit" % "4.11" % "test"
 

diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,17 @@
     <groupId>jpass</groupId>
     <artifactId>jpass</artifactId>
     <packaging>jar</packaging>
-    <version>0.1.16-SNAPSHOT</version>
+    <version>0.1.16-RELEASE</version>
     <name>JPass</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>2.9.3</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -29,19 +34,6 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>jpass.JPass</mainClass>
-                        </manifest>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.7</version>
@@ -64,6 +56,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <mainClass>jpass.JPass</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>assemble-all</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/dist/jpass.bat b/src/main/dist/jpass.bat
@@ -1,2 +1,2 @@
 @echo off
-start /B javaw -jar jpass-0.1.16-SNAPSHOT.jar %*
+start /B javaw -jar jpass-0.1.16-RELEASE.jar %*
diff --git a/src/main/dist/jpass.sh b/src/main/dist/jpass.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -jar jpass-0.1.16-SNAPSHOT.jar "$@"
+java -jar jpass-0.1.16-RELEASE.jar "$@"
diff --git a/src/main/dist/readme.txt b/src/main/dist/readme.txt
@@ -1,4 +1,4 @@
-# JPass - Password Manager 0.1.16-SNAPSHOT
+# JPass - Password Manager 0.1.16-RELEASE
 
 Overview
 --------
@@ -17,11 +17,11 @@ Features:
 Usage
 -----
 Java 6 or later is recommended to run JPass. Most platforms have a mechanism
-to execute `.jar` files (e.g. double click the `jpass-0.1.16-SNAPSHOT.jar`).
+to execute `.jar` files (e.g. double click the `jpass-0.1.16-RELEASE.jar`).
 You can also run the application from the command line by typing (the password
 file is optional):
 
-    java -jar jpass-0.1.16-SNAPSHOT.jar [password_file]
+    java -jar jpass-0.1.16-RELEASE.jar [password_file]
 
 Configuration
 -------------
@@ -36,7 +36,7 @@ Default configurations can be overridden in `jpass.properties` file:
 
 License
 -------
-Copyright (c) 2009-2017 Gabor Bata
+Copyright (c) 2009-2018 Gabor Bata
 
 All rights reserved.
 
@@ -140,3 +140,13 @@ http://tango.freedesktop.org/Tango_Desktop_Project
 The Tango base icon theme is licensed under the Creative Commons Attribution
 Share-Alike license.
 http://creativecommons.org/licenses/by-sa/2.5/
+
+---
+
+This software includes Jackson JSON processor databind module,
+licensed under the Apache (Software) License, version 2.0 ("the License").
+See the License for details about distribution rights,
+and the specific rights regarding derivate works.
+
+You may obtain a copy of the License at:
+http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/jpass/JPass.java b/src/main/java/jpass/JPass.java
@@ -1,7 +1,7 @@
 /*
  * JPass
  *
- * Copyright (c) 2009-2017 Gabor Bata
+ * Copyright (c) 2009-2018 Gabor Bata
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/jpass/data/DataModel.java b/src/main/java/jpass/data/DataModel.java
@@ -1,7 +1,7 @@
 /*
  * JPass
  *
- * Copyright (c) 2009-2017 Gabor Bata
+ * Copyright (c) 2009-2018 Gabor Bata
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without