Merge branch 'a-schild:main' into issue-92

xylo · web-flow · commit 947e57e331fe · 2025-10-21T17:49:11.000+02:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,25 +4,28 @@
 name: Java CI with Maven
 
 on:
+# Triggers the workflow on push for the main and develop branch
   push:
-    branches: [ develop ]
+    branches: [ main, develop ]
   pull_request:
-    branches: [ develop ]
+    branches: [ main, develop ]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    permissions: 
+      contents: read
+      packages: write 
 
     steps:
-    - uses: actions/checkout@3
-      with:
-        ref: ${{ github.ref }}
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
-      with:
-        java-version: 8.0
-        distribution: 'adopt'
-        architecture: x64
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      - uses: actions/checkout@v5
+        with:
+          ref: ${{ github.ref }}
+      - uses: actions/setup-java@v5
+        with:
+          java-version: 11
+          distribution: 'zulu'
+          architecture: x64
+
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,11 @@
 # Changelog for nextcloud api
+
+## Version 14.0.0
+- 2025-10-21
+  - Bump required java version from 8 to 11+ (Thanks to kindlich)
+  - Make connection autoclosable (thanks to raboof)
+  - Bump pom.xml dependencies where possible
+
 ## Version 13.0.2
 - 2024-03-16
   - Typo fixes
diff --git a/README.md b/README.md
@@ -19,10 +19,11 @@ Java api library to access nextcloud features from java applications
 	<dependency>
 	    <groupId>com.github.a-schild</groupId>
 	    <artifactId>nextcloud-java-api</artifactId>
-	    <version>13.1.0</version>
+	    <version>14.0.0</version>
 	</dependency>
 ```
 
+- The 14.x versions require Java 11+,as the jakarta.xml binding requires Java 11+
 - The 13.x versions are now using the jakarta.xml binding stuff, to prevent problems with Java 11+
   No API changes have been made in v13, but at some places the XML stuff is exposed
   Which made it necessary to bump the major version number
diff --git a/nbactions.xml b/nbactions.xml
@@ -5,6 +5,7 @@
             <displayName>Deploy</displayName>
             <goals>
                 <goal>deploy</goal>
+                <goal>-DskipTests</goal>
             </goals>
         </action>
     </actions>
diff --git a/pom.xml b/pom.xml
@@ -3,47 +3,48 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.aarboard.nextcloud</groupId>
     <artifactId>nextcloud-api</artifactId>
-    <version>13.1.0</version>
+    <version>14.0.1</version>
     <packaging>jar</packaging>
     <properties>
         <!-- compile time dependencies -->
         <httpcore.version>4.4.16</httpcore.version>
         <httpasyncclient.version>4.1.5</httpasyncclient.version>
         <httpclient.version>4.5.14</httpclient.version>
-        <slf4j-api.version>2.0.13</slf4j-api.version>
-        <sardine.version>5.12</sardine.version>
-        <commons-io.version>2.16.1</commons-io.version>
-        <commons-lang3.version>3.18.0</commons-lang3.version>
-        <commons-codec.version>1.17.0</commons-codec.version>
-        <jackson.version>2.17.1</jackson.version>
-        <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
+        <slf4j-api.version>2.0.17</slf4j-api.version>
+        <sardine.version>5.13</sardine.version>
+        <commons-io.version>2.20.0</commons-io.version>
+        <commons-lang3.version>3.19.0</commons-lang3.version>
+        <commons-codec.version>1.19.0</commons-codec.version>
+        <jackson.version>2.20.0</jackson.version>
+        <jakarta.xml.bind-api.version>4.0.4</jakarta.xml.bind-api.version>
         <jakarta-annotation-api.version>2.1.1</jakarta-annotation-api.version>
-        <jaxb-impl.version>3.0.0</jaxb-impl.version>
+        <jaxb-impl.version>3.0.2</jaxb-impl.version>
         
         <!-- test dependencies versions -->
+        <skipTests>true</skipTests>
         <slf4j-simple.version>${slf4j-api.version}</slf4j-simple.version>
-        <jaxb-runtime.version>4.0.3</jaxb-runtime.version>
+        <jaxb-runtime.version>4.0.6</jaxb-runtime.version>
         <junit.version>4.13.2</junit.version>
 
         <!-- build environment versions -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
-        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+        <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
+        <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-        <buildnumber-maven-plugin.version>3.1.0</buildnumber-maven-plugin.version>
+        <buildnumber-maven-plugin.version>3.2.1</buildnumber-maven-plugin.version>
         <templating-maven-plugin.version>1.0.0</templating-maven-plugin.version>
-        <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-        <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
-        <maven-scm-provider-gitexe.version>2.0.1</maven-scm-provider-gitexe.version>
-        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-        <cyclonedx-maven-plugin.version>2.7.9</cyclonedx-maven-plugin.version>
+        <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
+        <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
+        <central-publishing-maven-plugin>0.9.0</central-publishing-maven-plugin>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
+        <maven-scm-provider-gitexe.version>2.2.1</maven-scm-provider-gitexe.version>
+        <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+        <cyclonedx-maven-plugin.version>2.9.1</cyclonedx-maven-plugin.version>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <netbeans.hint.license>gpl30</netbeans.hint.license>
     </properties>
     <name>NextCloud Java API library</name>
@@ -322,14 +323,12 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>${nexus-staging-maven-plugin.version}</version>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.9.0</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <publishingServerId>ossrh</publishingServerId>
                 </configuration>
             </plugin>
             <plugin>
@@ -380,6 +379,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
+                    <configuration>
+                        <skipTests>${skipTests}</skipTests>
+                    </configuration>                    
                     <systemProperties>
                         <property>
                             <name>nextcloud.api.test.servername</name>
diff --git a/src/main/java/org/aarboard/nextcloud/api/NextcloudConnector.java b/src/main/java/org/aarboard/nextcloud/api/NextcloudConnector.java
@@ -39,7 +39,7 @@
 import org.aarboard.nextcloud.api.webdav.pathresolver.WebDavPathResolver;
 import org.aarboard.nextcloud.api.webdav.pathresolver.WebDavPathResolverBuilder;
 
-public class NextcloudConnector {
+public class NextcloudConnector implements AutoCloseable {
 
     private final ServerConfig serverConfig;
     private final ProvisionConnector pc;
@@ -188,6 +188,16 @@ public void shutdown() throws IOException {
         ConnectorCommon.shutdown();
     }
 
+    /**
+     * Close the HTTP client. Perform this to cleanly shut down this
+     * application.
+     *
+     * @throws Exception In case of errors
+     */
+    public void close() throws Exception {
+        shutdown();
+    }
+
     /**
      * Trust all HTTPS certificates presented by the server. This is e.g. used
      * to work against a Nextcloud instance with a self-signed certificate.
@@ -970,6 +980,7 @@ public void uploadFile(File srcFile, String remotePath) {
      * (temp) file to upload the data, so the content length is known in advance
      * <a href="https://github.com/a-schild/nextcloud-java-api/issues/20">...</a>
      */
+    @Deprecated
     public void uploadFile(InputStream inputStream, String remotePath) {
         fl.uploadFile(inputStream, remotePath);
     }
@@ -989,6 +1000,7 @@ public void uploadFile(InputStream inputStream, String remotePath) {
      * (temp) file to upload the data, so the content length is known in advance
      * <a href="https://github.com/a-schild/nextcloud-java-api/issues/20">...</a>
      */
+    @Deprecated
     public void uploadFile(InputStream inputStream, String remotePath, boolean continueHeader) {
         fl.uploadFile(inputStream, remotePath, continueHeader);
     }
diff --git a/src/main/java/org/aarboard/nextcloud/api/ServerConfig.java b/src/main/java/org/aarboard/nextcloud/api/ServerConfig.java
@@ -128,9 +128,10 @@ public void setServerName(String serverName){
 	}
 	
 	/**
-         * @deprecated Use getSubPathPrefix() instead
+     * @deprecated Use getSubPathPrefix() instead
 	 * @return the configured subpath prefix
 	 */
+    @Deprecated
 	public String getSubpathPrefix(){
 		return getSubPathPrefix();
 	}
@@ -143,9 +144,10 @@ public String getSubPathPrefix(){
 	}
         
 	/**
-         * @deprecated Use setSubPathPrefix() instead
+     * @deprecated Use setSubPathPrefix() instead
 	 * @param subpathPrefix to apply
 	 */
+    @Deprecated
 	public void setSubpathPrefix(String subpathPrefix){
             setSubPathPrefix(subpathPrefix);
 	}

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,10 @@ public void setServerName(String serverName){`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`/**`
`131`		`- * @deprecated Use getSubPathPrefix() instead`
	`131`	`+ * @deprecated Use getSubPathPrefix() instead`
`132`	`132`	`* @return the configured subpath prefix`
`133`	`133`	`*/`
	`134`	`+ @Deprecated`
`134`	`135`	`public String getSubpathPrefix(){`
`135`	`136`	`return getSubPathPrefix();`
`136`	`137`	`}`
`@@ -143,9 +144,10 @@ public String getSubPathPrefix(){`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`/**`
`146`		`- * @deprecated Use setSubPathPrefix() instead`
	`147`	`+ * @deprecated Use setSubPathPrefix() instead`
`147`	`148`	`* @param subpathPrefix to apply`
`148`	`149`	`*/`
	`150`	`+ @Deprecated`
`149`	`151`	`public void setSubpathPrefix(String subpathPrefix){`
`150`	`152`	`setSubPathPrefix(subpathPrefix);`
`151`	`153`	`}`