Remove OH1 add-ons (#1026)

OH3 no longer has the OH1 compatibility layer so it shouldn't package or support such add-ons. Related to: openhab/openhab-core#1284 Signed-off-by: Wouter Born <github@maindrain.net>
openhab · Dec 23, 2019 · e33982f · e33982f
1 parent c3cfc5f
commit e33982f
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 116 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,6 @@ When no solution was found, use the table below to determine where your issue sh
 
 | Issue | Where to report |
 |--------------------------------------------------------------|---------------------------------------------------------------------------|
-| Problems and feature requests for openHAB 1 addons | [openHAB1-addons](https://github.com/openhab/openhab1-addons/issues) |
 | Problems and feature requests for openHAB addons | [openHAB-addons](https://github.com/openhab/openhab-addons/issues) |
 | Problems and feature requests for openHAB Web UIs | [openHAB-webui](https://github.com/openhab/openhab-webui/issues) |
 | Issues related to the runtime environment, IDE and packaging | [openHAB-distro](https://github.com/openhab/openhab-distro/issues) |

diff --git a/distributions/online-repo/pom.xml b/distributions/online-repo/pom.xml
@@ -20,12 +20,6 @@
  <version>${project.version}</version>
  <type>kar</type>
  </dependency>
- <dependency>
- <groupId>org.openhab.distro</groupId>
- <artifactId>openhab-addons-legacy</artifactId>
- <version>${project.version}</version>
- <type>kar</type>
- </dependency>
  </dependencies>
 
  <build>
@@ -40,7 +34,6 @@
  <tasks>
  <echo message="unzipping file"/>
  <unzip dest="target" src="../openhab-addons/target/openhab-addons-${project.version}.kar"/>
- <unzip dest="target" src="../openhab-addons-legacy/target/openhab-addons-legacy-${project.version}.kar"/>
  </tasks>
  </configuration>
  <goals>

diff --git a/distributions/openhab-addons-legacy/pom.xml b/distributions/openhab-addons-legacy/pom.xml
diff --git a/distributions/openhab-addons-legacy/src/main/feature/feature.xml b/distributions/openhab-addons-legacy/src/main/feature/feature.xml
diff --git a/distributions/openhab-addons/pom.xml b/distributions/openhab-addons/pom.xml
@@ -28,13 +28,6 @@
  <classifier>features</classifier>
  <type>xml</type>
  </dependency>
- <dependency>
- <groupId>org.openhab.addons</groupId>
- <artifactId>openhab-addons</artifactId>
- <version>${oh1.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
  <dependency>
  <groupId>org.openhab.ui.features</groupId>
  <artifactId>org.openhab.ui.features</artifactId>

diff --git a/distributions/openhab-verify/pom.xml b/distributions/openhab-verify/pom.xml
@@ -35,13 +35,6 @@
  <type>kar</type>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>openhab-addons-legacy</artifactId>
- <version>${project.version}</version>
- <type>kar</type>
- <scope>provided</scope>
- </dependency>
  <dependency>
  <groupId>${project.groupId}</groupId>
  <artifactId>distro-kar</artifactId>

diff --git a/distributions/openhab/src/main/filtered-resources/userdata/etc/version.properties b/distributions/openhab/src/main/filtered-resources/userdata/etc/version.properties
@@ -7,6 +7,5 @@ Repository Version
 ----------------------------------------
 openhab-distro : ${project.version}
 openhab-core : ${ohc.version}
-openhab1-addons : ${oh1.version}
-openhab2-addons : ${oh2.version}
+openhab-addons : ${oh2.version}
 karaf : ${karaf.version}
diff --git a/distributions/openhab/src/main/resources/bin/update b/distributions/openhab/src/main/resources/bin/update
@@ -87,18 +87,15 @@ setup(){
  if test "${OHVersion#*-SNAPSHOT}" != "$OHVersion"; then
  DownloadLocation="https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-$OHVersion.zip"
  AddonsDownloadLocation="https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-addons/target/openhab-addons-$OHVersion.kar"
- LegacyAddonsDownloadLocation="https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-addons-legacy/target/openhab-addons-legacy-$OHVersion.kar"
  elif [ "$OHVersion" = "$CurrentVersion" ]; then
  echo "You are already on openHAB $CurrentVersion" >&2
  exit 1
  elif [ -n "$milestoneVersion" ]; then
  DownloadLocation="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/$OHVersion/openhab-$OHVersion.zip"
  AddonsDownloadLocation="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab-addons/$OHVersion/openhab-addons-$OHVersion.kar"
- LegacyAddonsDownloadLocation="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab-addons-legacy/$OHVersion/openhab-addons-legacy-$OHVersion.kar"
  else
  DownloadLocation="https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F$OHVersion%2Fopenhab-$OHVersion.zip"
  AddonsDownloadLocation="https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-addons%2F$OHVersion%2Fopenhab-addons-$OHVersion.kar"
- LegacyAddonsDownloadLocation="https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-addons-legacy%2F$OHVersion%2Fopenhab-addons-legacy-$OHVersion.kar"
  fi
 
  ## Set the temporary directories.
@@ -336,15 +333,6 @@ if [ -f "$AddonsFile" ]; then
  }
 fi
 
-## Do the same for the legacy addons file.
-LegacyAddonsFile="$WorkingDir/addons/openhab-addons-legacy-$CurrentVersion.kar"
-if [ -f "$LegacyAddonsFile" ]; then
- echo "Found an openHAB legacy addons file, replacing with new version..."
- rm -f "${LegacyAddonsFile:?}"
- curl -Lf# "$LegacyAddonsDownloadLocation" -o "$WorkingDir/addons/openhab-addons-legacy-$OHVersion.kar" || {
- echo "Download of legacy addons file failed, please find it on the openHAB website (www.openhab.org)" >&2
- }
-fi
 echo ""
 ## Remove the downloaded zip-file.
 echo "Deleting temporary files..."

diff --git a/distributions/openhab/src/main/resources/bin/update.ps1 b/distributions/openhab/src/main/resources/bin/update.ps1
@@ -488,17 +488,14 @@ Function Update-openHAB() {
  if ($Snapshot) {
  $DownloadLocation="https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-$OHVersionName.zip"
  $AddonsDownloadLocation="https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-addons/target/openhab-addons-$OHVersionName.kar"
- $LegacyAddonsDownloadLocation="https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-addons-legacy/target/openhab-addons-legacy-$OHVersionName.kar"
  }
  elseif ($Milestone -ne "") {
  $DownloadLocation="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/$OHVersionName/openhab-$OHVersionName.zip"
  $AddonsDownloadLocation="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab-addons/$OHVersionName/openhab-addons-$OHVersionName.kar"
- $LegacyAddonsDownloadLocation="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab-addons-legacy/$OHVersionName/openhab-addons-legacy-$OHVersionName.kar"
  }
  else {
  $DownloadLocation = "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F$OHVersion%2Fopenhab-$OHVersion.zip"
  $AddonsDownloadLocation = "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-addons%2F$OHVersion%2Fopenhab-addons-$OHVersion.kar"
- $LegacyAddonsDownloadLocation = "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-addons-legacy%2F$OHVersion%2Fopenhab-addons-legacy-$OHVersion.kar"
  }
 
  # If we are not in SkipNew (or SkipNew and the temporary distribution file/folders have not been created yet):
@@ -798,18 +795,6 @@ Function Update-openHAB() {
  }
 
 
- # Do the same for the legacy addons file.
- try {
- $LegacyAddonsFile = "$OHAddons\openhab-addons-legacy-$OHVersionName.kar"
- if (Test-Path -Path $LegacyAddonsFile) {
- Write-Host "Found an openHAB legacy addons file, replacing with new version"
- DeleteIfExists $LegacyAddonsFile
- DownloadFiles $LegacyAddonsDownloadLocation "$OHAddons\openhab-addons-legacy-$OHVersionName.kar"
- }
- } catch {
- return PrintAndThrow "Could not replace the $LegacyAddonsFile" $_
- }
-
  # Hop for joy - we did it!
  Write-Host -ForegroundColor Green "openHAB updated to version $OHVersionName!"
  Write-Host -ForegroundColor Green "Run start.bat to launch it."

diff --git a/distributions/openhab/src/main/resources/conf/services/addons.cfg b/distributions/openhab/src/main/resources/conf/services/addons.cfg
@@ -17,17 +17,10 @@
 #package = minimal
 
 # Access Remote Add-on Repository
-# Defines whether the remote openHAB add-on repository should be used for browsing and installing add-ons.
-# This not only makes latest snapshots of add-ons available, it is also required for the installation of
-# any legacy 1.x add-on. (default is true)
+# Defines whether the remote openHAB add-on repository should be used for browsing and installing add-ons. (default is true)
 #
 #remote = true
 
-# Include legacy 1.x bindings. If set to true, it also allows the installation of 1.x bindings for which there is 
-# already a 2.x version available (requires remote repo access, see above). (default is false)
-#
-#legacy = true
-
 # A comma-separated list of bindings to install (e.g. "binding = sonos,knx,zwave")
 #binding = 
 

diff --git a/distributions/pom.xml b/distributions/pom.xml
@@ -15,7 +15,6 @@
 
  <modules>
  <module>openhab-addons</module>
- <module>openhab-addons-legacy</module>
  <module>openhab</module>
  <module>openhab-verify</module>
  <module>online-repo</module>

diff --git a/pom.xml b/pom.xml
@@ -53,7 +53,6 @@
 
  <ohc.version>3.0.0-SNAPSHOT</ohc.version>
  <oh2.version>3.0.0-SNAPSHOT</oh2.version>
- <oh1.version>1.15.0-SNAPSHOT</oh1.version>
 
  <jackson.version>1.9.13</jackson.version>