Skip to content

Commit

Permalink
Merge branch 'master' into cgi-pre-release
Browse files Browse the repository at this point in the history
  • Loading branch information
Indrek Jentson committed Jun 29, 2017
2 parents 509a566 + 289e1e4 commit 691c99b
Show file tree
Hide file tree
Showing 50 changed files with 2,182 additions and 1,014 deletions.
19 changes: 0 additions & 19 deletions .classpath

This file was deleted.

31 changes: 6 additions & 25 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,9 @@
/build
/javadoc
/out
/junit_report
/coverage
/dist
/.idea/workspace.xml
/.idea/uiDesigner.xml

/tmp
/.idea/dictionaries/xp.xml
build
target
javadoc
.idea/workspace.xml
.idea/uiDesigner.xml
.idea/dictionaries/xp.xml
*.log

password.properties
copy-dss-jars.sh
/util
token
/bin
container.bin
createsECCSignature.bdoc
extractSignatureThrowsErrorWhenSignatureIsNotFound.zip
packaging_jar/
setsSignatureId.bdoc
setsSignatureId.ddoc
jacoco.exec
utility-package-lib
zip-package-lib
contiperf-report
Empty file removed .gitmodules
Empty file.
43 changes: 4 additions & 39 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

6 changes: 5 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ Developer:
Martin Beldman <[email protected]>
Aho Augasmägi <[email protected]>
Risto Alas <[email protected]>
Mihkel Selgal <[email protected]>
Mihkel Selgal <[email protected]>
Rainer Villido <[email protected]>
Andrei Smirnov <[email protected]>
Indrek Jentson <[email protected]>
Margus Kamlat <[email protected]>
6 changes: 6 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
DigiDoc4J Java library release notes
------------------------------------
Release 1.0.6 RC.1
--------------------
Summary of the major changes since 1.0.6 Beta.2
----------------------------------------
* Project building system is now Maven

Release 1.0.6 Beta.2
--------------------
Summary of the major changes since 1.0.6 Beta.1
Expand Down
15 changes: 15 additions & 0 deletions assembly/zip.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>library</id>
<baseDirectory>/</baseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>zip-package-lib</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
106 changes: 0 additions & 106 deletions build-ivy.xml

This file was deleted.

1 change: 0 additions & 1 deletion build.properties

This file was deleted.

Loading

0 comments on commit 691c99b

Please sign in to comment.