-
Notifications
You must be signed in to change notification settings - Fork 412
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/evcs_ocppserver' of https://github.com/OpenEMS/…
…openems into feature/evcs_ocppserver * 'feature/evcs_ocppserver' of https://github.com/OpenEMS/openems: (55 commits) Start development of version 2020.2.0-SNAPSHOT Push version to 2020.1.0 UI: General Adjustments (#1029) Add no of cycles option to influxdb module. (#1028) OneWire.Thermometer: remove unnecessary event handler property Update bndrun files Fix setting Session-ID from Odoo Improve error handling for JSON-RPC Error Response Update UI dependencies Start development of 2019.19.0-SNAPSHOT Push version to 2019.18.0 Add 'resolution' to QueryHistoricTimeseriesDataRequest Resolve BackendApp.bndrun Update UI dependencies Add Controllers for Predictive Delay Charge and ESS Sell-To-Grid Limit (for 70 % restriction) (#911) UI: improvements to formly and history SoC chart (#1027) Add Schneider Acti9 Smartlink Electricity Meter (#1014) Repair Checkstyle XML definition Add Thermometer-API, OneWire bridge and OneWire-Thermometer implementation (#891) Update Java dependencies #1023 #1021 #1015 ...
- Loading branch information
Showing
1,109 changed files
with
117,163 additions
and
22,260 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| /cache/ | ||
| local/index.* | ||
| release/index.* | ||
| release/index.* | ||
| templates/index.* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,90 @@ | ||
| buildpath: osgi.enroute.base.api;version=2.1 | ||
| testpath:\ | ||
| osgi.enroute.junit.wrapper;version=4.12,\ | ||
| osgi.enroute.hamcrest.wrapper;version=1.3 | ||
|
|
||
| -plugin.9x.enroute.distro = \ | ||
| # Configure Repositories | ||
| -plugin.1.R7.API: \ | ||
| aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ | ||
| releaseUrls=https://repo1.maven.org/maven2/; \ | ||
| revision=org.osgi:osgi.enroute.pom.distro:2.1.0; \ | ||
| name=Distro; \ | ||
| location=${build}/cache/enroute-distro.xml | ||
|
|
||
| -runblacklist.enroute: \ | ||
| osgi.identity;filter:='(osgi.identity=osgi.enroute.base.api)', \ | ||
| osgi.identity;filter:='(osgi.identity=osgi.cmpn)', \ | ||
| osgi.identity;filter:='(osgi.identity=osgi.core)', \ | ||
| osgi.identity;filter:='(osgi.identity=biz.aQute.junit)', \ | ||
| osgi.identity;filter:='(osgi.identity=biz.aQute.launcher)', \ | ||
| osgi.identity;filter:='(osgi.identity=biz.aQute.remote.launcher)' | ||
| snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ | ||
| releaseUrls=https://repo.maven.apache.org/maven2/; \ | ||
| revision=org.osgi.enroute:osgi-api:7.0.0; \ | ||
| readOnly=true; \ | ||
| name="OSGi R7 API" | ||
| -plugin.2.Enterprise.API: \ | ||
| aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ | ||
| snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ | ||
| releaseUrls=https://repo.maven.apache.org/maven2/; \ | ||
| revision=org.osgi.enroute:enterprise-api:7.0.0; \ | ||
| readOnly=true; \ | ||
| name="Enterprise Java APIs" | ||
| -plugin.3.R7.Impl: \ | ||
| aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ | ||
| snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ | ||
| releaseUrls=https://repo.maven.apache.org/maven2/; \ | ||
| revision=org.osgi.enroute:impl-index:7.0.0; \ | ||
| readOnly=true; \ | ||
| name="OSGi R7 Reference Implementations" | ||
| -plugin.4.Test: \ | ||
| aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ | ||
| snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ | ||
| releaseUrls=https://repo.maven.apache.org/maven2/; \ | ||
| revision=org.osgi.enroute:test-bundles:7.0.0; \ | ||
| readOnly=true; \ | ||
| name="Testing Bundles" | ||
| -plugin.5.Debug: \ | ||
| aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ | ||
| snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ | ||
| releaseUrls=https://repo.maven.apache.org/maven2/; \ | ||
| revision=org.osgi.enroute:debug-bundles:7.0.0; \ | ||
| readOnly=true; \ | ||
| name="Debug Bundles" | ||
| -plugin.6.Central: \ | ||
| aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ | ||
| releaseUrls=https://repo.maven.apache.org/maven2/; \ | ||
| pom=${build}/pom.xml; \ | ||
| readOnly=true; \ | ||
| name="Maven Central" | ||
| -plugin.7.Local: \ | ||
| aQute.bnd.deployer.repository.LocalIndexedRepo; \ | ||
| name = Local; \ | ||
| pretty = true; \ | ||
| local = ${build}/local | ||
|
|
||
| -runproperties.eqnx: \ | ||
| org.apache.felix.http.jettyEnabled=true, \ | ||
| org.apache.felix.http.whiteboardEnabled=true,\ | ||
| osgi.console=, \ | ||
| osgi.console.enable.builtin=false | ||
| -plugin.8.Templates: \ | ||
| aQute.bnd.deployer.repository.LocalIndexedRepo; \ | ||
| name = Templates; \ | ||
| pretty = true; \ | ||
| local = ${build}/templates | ||
|
|
||
| -runpath.eqnx: osgi.enroute.equinox.log.adapter | ||
| -runrequires.eqnx: \ | ||
| osgi.identity;filter:='(osgi.identity=org.apache.felix.log)' | ||
| -plugin.9.Release: \ | ||
| aQute.bnd.deployer.repository.LocalIndexedRepo; \ | ||
| name = Release; \ | ||
| pretty = true; \ | ||
| local = ${build}/release | ||
|
|
||
| -runsystempackages.eqnx: javax.script | ||
| -runsystemcapabilities.dflt: ${native_capability} | ||
| -releaserepo: Release | ||
| -baselinerepo: Release | ||
|
|
||
| debug-bundles: \ | ||
| osgi.identity;filter:='(osgi.identity=osgi.enroute.webconsole.xray.provider)',\ | ||
| osgi.implementation;filter:='(osgi.implementation=osgi.metatype)',\ | ||
| osgi.implementation;filter:='(osgi.implementation=osgi.log)',\ | ||
| osgi.implementation;filter:='(osgi.implementation=osgi.event)',\ | ||
| osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\ | ||
| osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)', \ | ||
| osgi.identity;filter:='(osgi.identity=osgi.enroute.base.debug.provider)' | ||
|
|
||
| javac.source: 1.8 | ||
| javac.target: 1.8 | ||
| -runee: JavaSE-1.8 | ||
| # Always use contracts | ||
| -contract: * | ||
|
|
||
| -dsannotations: * | ||
| -metatypeannotations: * | ||
| -contract: * | ||
| # Set Git revision information in the manifests of built bundles | ||
| Git-Descriptor: ${system-allow-fail;git describe --dirty --always} | ||
| Git-SHA: ${system-allow-fail;git rev-list -1 HEAD} | ||
|
|
||
| test-cases: ${classes;NAMED;*Test} | ||
| -resolve.effective: resolve, active | ||
| -releaserepo: Release | ||
| # JUnit | ||
| junit: org.apache.servicemix.bundles.junit; version=4.12 | ||
| mockito: org.mockito.mockito-core; version=2.13.0 | ||
| mockito-deps: org.objenesis; version=2.6.0,\ | ||
| net.bytebuddy.byte-buddy; version=1.7.9,\ | ||
| net.bytebuddy.byte-buddy-agent; version=1.7.9 | ||
|
|
||
| -plugin.4.Central: \ | ||
| aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ | ||
| releaseUrls=https://repo1.maven.org/maven2/; \ | ||
| pom=${build}/pom.xml; \ | ||
| name="Maven Central"; \ | ||
| location=${build}/cache/enroute-pom.xml | ||
| # OpenEMS bnd.bnd defaults | ||
| buildpath: \ | ||
| osgi.annotation; version=7.0.0,\ | ||
| osgi.core; version=7.0.0,\ | ||
| osgi.cmpn; version=7.0.0 | ||
|
|
||
| -plugin.6.Local: \ | ||
| aQute.bnd.deployer.repository.LocalIndexedRepo; \ | ||
| name = Local ; \ | ||
| pretty = true ; \ | ||
| local = ${build}/local | ||
| testpath: \ | ||
| \${junit},\ | ||
| \${mockito},\ | ||
| \${mockito-deps} | ||
|
|
||
| -plugin.9.Release: \ | ||
| aQute.bnd.deployer.repository.LocalIndexedRepo; \ | ||
| name = Release ; \ | ||
| pretty = true ; \ | ||
| local = ${build}/release | ||
| javac.source: 1.8 | ||
| javac.target: 1.8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.