Skip to content

Commit 84e8e3b

Browse files
msqrmsqr
committed
Merge branch 'release/4.0.0'
2 parents b8fec16 + ac7f455 commit 84e8e3b

1,695 files changed

Lines changed: 14823 additions & 33169 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎net.solarnetwork.node.backup.ext/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="build/eclipse"/>

‎net.solarnetwork.node.backup.ext/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4-
org.eclipse.jdt.core.compiler.compliance=11
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.compliance=17
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
77
org.eclipse.jdt.core.compiler.release=disabled
8-
org.eclipse.jdt.core.compiler.source=11
8+
org.eclipse.jdt.core.compiler.source=17

‎net.solarnetwork.node.backup.ext/META-INF/MANIFEST.MF‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: Backup External Filesystems
44
Bundle-Description: Backup device filesystem resources.
55
Bundle-SymbolicName: net.solarnetwork.node.backup.ext
6-
Bundle-Version: 3.0.0
6+
Bundle-Version: 4.0.0
77
Bundle-Vendor: SolarNetwork
88
Automatic-Module-Name: net.solarnetwork.node.backup.ext
9-
Bundle-RequiredExecutionEnvironment: JavaSE-11
9+
Bundle-RequiredExecutionEnvironment: JavaSE-17
1010
Import-Package:
11-
net.solarnetwork.node;version="[2.0,3.0)",
11+
net.solarnetwork.node;version="[2.1,3.0)",
1212
net.solarnetwork.node.backup;version="[2.0,3.0)",
1313
org.slf4j;version="[1.7,2.0)",
14-
org.springframework.beans.factory;version="[5.3,6.0)",
15-
org.springframework.context;version="[5.3,6.0)",
16-
org.springframework.context.support;version="[5.3,6.0)",
17-
org.springframework.core.io;version="[5.3,6.0)",
18-
org.springframework.util;version="[5.3,6.0)"
14+
org.springframework.beans.factory;version="[6.2,7.0)",
15+
org.springframework.context;version="[6.2,7.0)",
16+
org.springframework.context.support;version="[6.2,7.0)",
17+
org.springframework.core.io;version="[6.2,7.0)",
18+
org.springframework.util;version="[6.2,7.0)"

‎net.solarnetwork.node.backup.ext/ivy.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<artifact type="sources" ext="jar" conf="sources" m:classifier="sources"/>
1414
</publications>
1515
<dependencies defaultconfmapping="runtime->default(runtime);compile->default(compile)">
16-
<dependency org="net.solarnetwork.node" name="net.solarnetwork.node" rev="[3.0,)"/>
17-
<dependency org="org.osgi" name="org.osgi.core" rev="5.0.0"/>
18-
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.32"/>
19-
<dependency org="org.springframework" name="spring-context-support" rev="5.3.24"/>
16+
<dependency org="net.solarnetwork.node" name="net.solarnetwork.node" rev="4.0.0"/>
17+
<dependency org="org.osgi" name="org.osgi.framework" rev="1.10.0"/>
18+
<dependency org="org.slf4j" name="slf4j-api" rev="2.0.17"/>
19+
<dependency org="org.springframework" name="spring-context-support" rev="6.2.6"/>
2020
</dependencies>
2121
</ivy-module>

‎net.solarnetwork.node.backup.s3.test/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src">
66
<attributes>

‎net.solarnetwork.node.backup.s3.test/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4-
org.eclipse.jdt.core.compiler.compliance=11
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.compliance=17
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
77
org.eclipse.jdt.core.compiler.release=disabled
8-
org.eclipse.jdt.core.compiler.source=11
8+
org.eclipse.jdt.core.compiler.source=17

‎net.solarnetwork.node.backup.s3.test/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: S3 Backup Tests
44
Bundle-SymbolicName: net.solarnetwork.node.backup.s3.test
5-
Bundle-Version: 3.0.0
5+
Bundle-Version: 4.0.0
66
Bundle-Vendor: SolarNetwork
7-
Fragment-Host: net.solarnetwork.node.backup.s3;bundle-version="[3.0,4.0)"
7+
Fragment-Host: net.solarnetwork.node.backup.s3;bundle-version="[4.0,5.0)"
88
Automatic-Module-Name: net.solarnetwork.node.backup.s3.test
9-
Bundle-RequiredExecutionEnvironment: JavaSE-11
9+
Bundle-RequiredExecutionEnvironment: JavaSE-17
1010
Import-Package:
1111
net.solarnetwork.node.test;version="[2.0,3.0)",
1212
net.solarnetwork.test;version="[1.6,2.0)",

‎net.solarnetwork.node.backup.s3.test/ivy.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</info>
77
<dependencies defaultconfmapping="runtime->default(runtime);compile->default(runtime)">
88
<!-- Testing -->
9-
<dependency org="net.solarnetwork.common.test" name="net.solarnetwork.common.test" rev="[1.20,)"/>
10-
<dependency org="net.solarnetwork.node.test" name="net.solarnetwork.node.test" rev="[2.0,)"/>
9+
<dependency org="net.solarnetwork.common.test" name="net.solarnetwork.common.test" rev="2.0.0"/>
10+
<dependency org="net.solarnetwork.node.test" name="net.solarnetwork.node.test" rev="3.0.0"/>
1111

1212
<!-- Testing support -->
1313
<dependency org="com.amazonaws" name="aws-java-sdk-osgi" rev="1.11.651"/>

‎net.solarnetwork.node.backup.s3.test/src/net/solarnetwork/node/backup/s3/test/S3BackupServiceTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
package net.solarnetwork.node.backup.s3.test;
2424

2525
import static java.lang.String.format;
26+
import static org.hamcrest.MatcherAssert.assertThat;
2627
import static org.hamcrest.Matchers.equalTo;
2728
import static org.hamcrest.Matchers.hasSize;
2829
import static org.hamcrest.Matchers.is;
29-
import static org.junit.Assert.assertThat;
3030
import java.io.ByteArrayInputStream;
3131
import java.io.IOException;
3232
import java.time.LocalDateTime;

‎net.solarnetwork.node.backup.s3/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="build/eclipse"/>

0 commit comments

Comments
 (0)