Skip to content

Build and metadata cleanup and fixes #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joewiz merged 7 commits into from
Jun 30, 2021
Merged

Build and metadata cleanup and fixes #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
403c396
Add missing dependencies and fix dependency versions for eXist-db 5.3…
adamretter Jun 30, 2021
16ad42f
Update developers/contributors entries
adamretter Jun 30, 2021
c14626d
Remove remaining Eclipse IDE project files
adamretter Jun 30, 2021
3c524c6
Source code goes in the src/ folder
adamretter Jun 30, 2021
b5bdb2e
Extensions should use Slf4j API for logging and not log4j
adamretter Jun 30, 2021
80858f6
Fix license headers
adamretter Jun 30, 2021
138e85a
Fix a bug whereby the index.html was not included in the XAR
adamretter Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ target/
*.iml
.idea/
.classpath
.project
.settings
.vscode

23 changes: 0 additions & 23 deletions .project
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions LGPL2.1-template.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
${project.name}
${project.description}
Copyright (C) ${project.inceptionYear} ${organization}

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License
as published by the Free Software Foundation; either version 2.1
of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16 changes: 0 additions & 16 deletions build/ro.kuberam.expath.exist.crypto package.launch
View file
Open in desktop

This file was deleted.

150 changes: 133 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,33 @@
<?xml version="1.0"?>
<!--

eXist-db EXPath Cryptographic library
eXist-db wrapper for EXPath Cryptographic Java library
Copyright (C) 2016 The eXist-db Authors

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License
as published by the Free Software Foundation; either version 2.1
of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.exist-db</groupId>
<artifactId>exist-apps-parent</artifactId>
<version>1.10.0</version>
<version>1.11.0</version>
</parent>

<groupId>org.exist-db.xquery.extensions.expath</groupId>
Expand Down Expand Up @@ -34,7 +55,7 @@
</scm>

<organization>
<name>exist-db Project</name>
<name>The eXist-db Project</name>
<url>https://exist-db.org</url>
</organization>

Expand All @@ -49,17 +70,24 @@
<name>Olaf Schreck</name>
<email>olaf@existsolutions.com</email>
</developer>
<developer>
<id>adamretter</id>
<name>Adam Retter</name>
<email>adam@evolvedbinary.com</email>
<organization>Evolved Binary</organization>
<organizationUrl>https://www.evolvedbinary.com</organizationUrl>
</developer>
</developers>

<contributors>
<contributor>
<name>Adam Retter</name>
<email>adam@exist-db.org</email>
</contributor>
<contributor>
<name>Juri Leino</name>
<email>juri@existsolutions.com</email>
</contributor>
<contributor>
<name>Joseph Wicentowski</name>
<email>joewiz@gmail.com</email>
</contributor>
</contributors>

<properties>
Expand All @@ -84,32 +112,42 @@
<version>${exist.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.13.3</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
<scope>provided</scope>
</dependency>

<!-- dependency>
<dependency>
<groupId>com.evolvedbinary.j8fu</groupId>
<artifactId>j8fu</artifactId>
<version>1.22</version>
<version>1.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<scope>provided</scope>
</dependency -->
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.10.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

Expand All @@ -126,6 +164,67 @@
</testResources>

<plugins>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<configuration>
<failIfMissing>true</failIfMissing>
<aggregate>true</aggregate>
<strictCheck>false</strictCheck>
<licenseSets>

<!-- this enforces the original Copyright and License -->
<licenseSet>
<header>LGPL2.1-template.txt</header>
<properties>
<owner>${project.organization.name}</owner>
<organization>Claudius Teodorescu</organization>
<url>${project.organization.url}</url>
</properties>
<excludes>
<exclude>.github/**</exclude>
<exclude>README.md</exclude>
<exclude>LICENSE</exclude>
<exclude>xquery-license-style.xml</exclude>
<exclude>src/main/resources/**</exclude>
<exclude>src/markdown-page-generator/**</exclude>
<exclude>src/test/resources/**</exclude>
<exclude>src/test/resources-filtered/**</exclude>

<!-- files now authored by the EXPath project (see below) -->
<exclude>pom.xml</exclude>
<exclude>src/test/java/xquery/crypto/CryptoIT.java</exclude>
</excludes>
</licenseSet>

<!-- this enforces the EXPath Copyright and License on newer files -->
<licenseSet>
<header>LGPL2.1-template.txt</header>
<properties>
<owner>${project.organization.name}</owner>
<organization>The eXist-db Authors</organization>
<url>${project.organization.url}</url>
</properties>
<includes>
<include>pom.xml</include>
<include>src/test/java/xquery/crypto/CryptoIT.java</include>
<!-- include>src/test/java/ro/kuberam/libs/java/crypto/TestUtils.java</include>
Copy link
Member

@line-o line-o Jun 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would remove code instead of commenting it out. It will stay in version control if we ever need to get back to it.

Copy link
Member

@joewiz joewiz Jun 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, Juri, GitHub didn't show me your comment until after I merged!

<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HashBinaryTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HashBinaryWithWrongAlgorithmTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HashLargeBinaryTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HashLargeStringTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HashStringTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HashStringWithWrongAlgorithmTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HMACBinaryTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HMACLargeBinaryTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HMACLargeStringTest.java</include>
<include>src/test/java/ro/kuberam/libs/java/crypto/digest/HMACStringTest.java</include -->
</includes>
</licenseSet>
</licenseSets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -176,11 +275,28 @@
</executions>
<configuration>
<inputDirectory>${project.basedir}</inputDirectory>
<headerHtmlFile>${project.basedir}/build/header.html</headerHtmlFile>
<footerHtmlFile>${project.basedir}/build/footer.html</footerHtmlFile>
<defaultTitle>index.html</defaultTitle>
<headerHtmlFile>${project.basedir}/src/markdown-page-generator/header.html</headerHtmlFile>
<footerHtmlFile>${project.basedir}/src/markdown-page-generator/footer.html</footerHtmlFile>
</configuration>
</plugin>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
<version>1.0.1</version>
<executions>
<execution>
<id>rename-readme-file</id>
<phase>prepare-package</phase>
<goals>
<goal>rename</goal>
</goals>
<configuration>
<sourceFile>${project.build.directory}/html/README.html</sourceFile>
<destinationFile>${project.build.directory}/html/index.html</destinationFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>ro.kuberam.maven.plugins</groupId>
<artifactId>kuberam-expath-plugin</artifactId>
Expand Down
38 changes: 19 additions & 19 deletions src/main/java/org/expath/exist/crypto/EXpathCryptoException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* eXist-db EXPath Cryptographic library
* eXist-db wrapper for EXPath Cryptographic Java library
* Copyright (C) 2016 Claudius Teodorescu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package org.expath.exist.crypto;

import org.exist.xquery.ErrorCodes.ErrorCode;
Expand All @@ -6,25 +25,6 @@

import ro.kuberam.libs.java.crypto.CryptoError;

/**
* eXist-db EXPath Cryptographic library eXist-db wrapper for EXPath
* Cryptographic Java library Copyright (C) 2018 Claudius Teodorescu
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

public class EXpathCryptoException extends XPathException {

private static final long serialVersionUID = -6789727720893604433L;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/expath/exist/crypto/ExistExpathCryptoModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* eXist-db EXPath Cryptographic library
* eXist-db wrapper for EXPath Cryptographic Java library
* Copyright (C) 2016 Claudius Teodorescu
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/org/expath/exist/crypto/ExpathCryptoErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* eXist-db EXPath Cryptographic library
* eXist-db wrapper for EXPath Cryptographic Java library
* Copyright (C) 2016 Claudius Teodorescu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package org.expath.exist.crypto;

import org.exist.dom.QName;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/expath/exist/crypto/ModuleProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* eXist-db EXPath Cryptographic library
* eXist-db wrapper for EXPath Cryptographic Java library
* Copyright (C) 2016 Claudius Teodorescu
Expand Down
Loading