Merge branch 'master' into cgi-pre-release

open-eid · Feb 1, 2018 · e9d2545 · e9d2545
2 parents 01ec28a + 26f64ed
commit e9d2545
Show file tree

Hide file tree

Showing 48 changed files with 986 additions and 505 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,5 @@
 /build
 /target
-.idea/workspace.xml
-.idea/uiDesigner.xml
-.idea/dictionaries/xp.xml
-.idea/libraries
-*.log
-/utility-package-lib
-/zip-package-lib
+.idea/*
+!.idea/codeStyleSettings.xml
 /buildNumber.properties
-/Old*
-/logback.xml
-!/src/main/etc/logback.xml
-/lib
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.settings/org.apache.ivyde.eclipse.prefs b/.settings/org.apache.ivyde.eclipse.prefs
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,12 @@
 DigiDoc4J Java library release notes
 ------------------------------------
+Release 2.0.0.RC.2
+------------------
+Summary of the major changes since 2.0.0.RC.1
+------------------------------------------
+* Added support for TLWellSigned parameter.
+* Some refctoring in Signature classes and utilities.
+
 Release 2.0.0.RC.1
 ------------------
 Summary of the major changes since 1.0.8.beta.2

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.digidoc4j</groupId>
     <artifactId>digidoc4j</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0.RC.1</version>
+    <version>2.0.0.RC.2</version>
     <name>DigiDoc4j</name>
     <description>DigiDoc4j is a Java library for digitally signing documents and creating digital signature containers
         of signed documents