New Upstream Snapshot - libscram-java
Ready changes
Summary
Merged new upstream version: 2.1+git20220802.1.e7856d8 (was: 2.1).
Resulting package
Built on 2022-12-20T08:01 (took 8m25s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libscram-java
Lintian Result
Diff
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8a2288f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.idea/
-target/
-*.iml
-nbactions.xml
-nb-configuration.xml
-/bin/
-.project
-.classpath
-.settings/
-hs_err*.log
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 7738d4e..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-image: openjdk:8-stretch
-
-stages:
- - build
-
-variables:
- M2_HOME: ".m2/maven"
- MAVEN_OPTS: "-Dmaven.repo.local=.m2"
-
-build:
- stage: build
- cache:
- paths:
- - .m2/
- script:
- - bash mvnw clean verify -P safer
-
-build-oracle-jdk-7:
- extends: build
- image: registry.gitlab.com/ongresinc/scram/oracle-jdk:7
diff --git a/README.md b/README.md
index caa651c..114c585 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ It is described as part of [RFC 5802](https://tools.ietf.org/html/rfc5802) and
This project will serve for the basis of
[PostgreSQL's](https://www.postgresql.org) [JDBC](https://jdbc.postgresql.org/)
-driver SCRAM support (coming in PostgreSQL 10).
+driver SCRAM support (supported since PostgreSQL 10).
The code is licensed under the BSD "Simplified 2 Clause" license (see [LICENSE](LICENSE)).
@@ -45,7 +45,6 @@ Please read [Client's README.md](client).
Javadoc: [](http://javadoc.io/doc/com.ongres.scram/client)
-
## Common API
'common' is the module that contains code common to both client and server SCRAM projects.
@@ -56,15 +55,13 @@ API. Import maven dependency:
<groupId>com.ongres.scram</groupId>
<artifactId>common</artifactId>
</dependency>
-
+
and check the Javadoc: [](http://javadoc.io/doc/com.ongres.scram/common)
## Contributing
Please submit [Merge Requests](https://gitlab.com/ongresinc/scram) for code contributions.
-Make sure to compile with `mvn -Psafer` before submitting a MR.
-
-Releases (on the master branch only) must be verified with:
+Make sure to compile with `mvn verify -Psafer` before submitting a MR.
- mvn -Psafer -Pmaster-branch
+By making a contribution to this project, you certify that you adhere to requirements of the [DCO](https://developercertificate.org/) by signing-off your commits (`git commit -s`).:
diff --git a/client/pom.xml b/client/pom.xml
index e3eeba3..7d4e1a1 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -9,7 +9,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.ongres.scram</groupId>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
</parent>
<artifactId>client</artifactId>
@@ -50,7 +50,7 @@
<plugin><!-- Used to generate JavaDoc with links pointing to javadoc.io -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>3.1.2</version>
<executions>
<execution>
<id>unpack-javadoc</id>
diff --git a/client/src/main/java/com/ongres/scram/client/ScramSession.java b/client/src/main/java/com/ongres/scram/client/ScramSession.java
index 45d94a3..1a834e4 100644
--- a/client/src/main/java/com/ongres/scram/client/ScramSession.java
+++ b/client/src/main/java/com/ongres/scram/client/ScramSession.java
@@ -216,9 +216,8 @@ public class ScramSession {
* Generates the SCRAM representation of the client-final-message, including the given channel-binding data.
* @param cbindData The bytes of the channel-binding data
* @return The message
- * @throws IllegalArgumentException If the channel binding data is null
*/
- private String clientFinalMessage(byte[] cbindData) throws IllegalArgumentException {
+ public String clientFinalMessage(byte[] cbindData) {
if(null == authMessage) {
generateAndCacheAuthMessage(cbindData);
}
diff --git a/common/pom.xml b/common/pom.xml
index 4eeb741..47177e5 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -9,7 +9,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.ongres.scram</groupId>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
+ <version>3.2.0</version>
<executions>
<execution>
<goals>
diff --git a/debian/changelog b/debian/changelog
index 701dbd8..78e4d48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libscram-java (2.1+git20220802.1.e7856d8-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 20 Dec 2022 07:54:40 -0000
+
libscram-java (2.1-1) unstable; urgency=medium
* New upstream version 2.1.
diff --git a/pom.xml b/pom.xml
index 5ea1fce..727a5cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<groupId>com.ongres.scram</groupId>
<artifactId>parent</artifactId>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -97,7 +97,7 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -107,7 +107,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -120,7 +120,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -133,7 +133,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -157,7 +157,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.4</version>
+ <version>3.0.5</version>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
@@ -184,7 +184,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-release</id>
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/maven-repo/com/ongres/scram/client/2.2-SNAPSHOT/client-2.2-SNAPSHOT.pom -rw-r--r-- root/root /usr/share/maven-repo/com/ongres/scram/common/2.2-SNAPSHOT/common-2.2-SNAPSHOT.pom -rw-r--r-- root/root /usr/share/maven-repo/com/ongres/scram/parent/2.2-SNAPSHOT/parent-2.2-SNAPSHOT.pom lrwxrwxrwx root/root /usr/share/java/scram-client-2.2-SNAPSHOT.jar -> scram-client.jar lrwxrwxrwx root/root /usr/share/java/scram-common-2.2-SNAPSHOT.jar -> scram-common.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/ongres/scram/client/2.2-SNAPSHOT/client-2.2-SNAPSHOT.jar -> ../../../../../../java/scram-client.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/ongres/scram/common/2.2-SNAPSHOT/common-2.2-SNAPSHOT.jar -> ../../../../../../java/scram-common.jar
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/maven-repo/com/ongres/scram/client/2.1/client-2.1.pom -rw-r--r-- root/root /usr/share/maven-repo/com/ongres/scram/common/2.1/common-2.1.pom -rw-r--r-- root/root /usr/share/maven-repo/com/ongres/scram/parent/2.1/parent-2.1.pom lrwxrwxrwx root/root /usr/share/java/scram-client-2.1.jar -> scram-client.jar lrwxrwxrwx root/root /usr/share/java/scram-common-2.1.jar -> scram-common.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/ongres/scram/client/2.1/client-2.1.jar -> ../../../../../../java/scram-client.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/ongres/scram/common/2.1/common-2.1.jar -> ../../../../../../java/scram-common.jar
No differences were encountered in the control files