From 0fd1fd100ab11a6a34c262e605ced3b166adec88 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Tue, 22 Jan 2019 10:12:56 -0800
Subject: Remove ghpages plugin (#996)

* Remove GhpagesPlugin. (#979)

* Restore old SCM reference (after removing ghpages)

* Remove reference to sbt-ghpages plugin.
---
 build.sbt           | 11 ++++++-----
 project/plugins.sbt |  2 --
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.sbt b/build.sbt
index d4233084..536f17a5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,10 +4,6 @@
 
 enablePlugins(SiteScaladocPlugin)
 
-enablePlugins(GhpagesPlugin)
-
-git.remoteRepo := "git@github.com:freechipsproject/firrtl.git"
-
 // Firrtl code
 
 organization := "edu.berkeley.cs"
@@ -109,7 +105,8 @@ javaSource in Antlr4 := (sourceManaged in Compile).value
 publishMavenStyle := true
 publishArtifact in Test := false
 pomIncludeRepository := { x => false }
-// Don't add 'scm' elements if we have a git.remoteRepo definition.
+// Don't add 'scm' elements if we have a git.remoteRepo definition,
+//  but since we don't (with the removal of ghpages), add them in below.
 pomExtra := <url>http://chisel.eecs.berkeley.edu/</url>
   <licenses>
     <license>
@@ -118,6 +115,10 @@ pomExtra := <url>http://chisel.eecs.berkeley.edu/</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
+  <scm>
+    <url>https://github.com/freechipsproject/firrtl.git</url>
+    <connection>scm:git:github.com/freechipsproject/firrtl.git</connection>
+  </scm>
   <developers>
     <developer>
       <id>jackbackrack</id>
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 1a7cb8a6..6baf83c6 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,8 +4,6 @@ resolvers += Classpaths.sbtPluginReleases
 
 resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
-
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.1")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
-- 
cgit v1.2.3


From 1d566b66bfd1b8809b2b605552343dc665dfd3c9 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Tue, 22 Jan 2019 13:14:14 -0800
Subject: Bump copyright year (#999)

---
 src/LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/LICENSE.txt b/src/LICENSE.txt
index ad3748f7..89fd3d00 100644
--- a/src/LICENSE.txt
+++ b/src/LICENSE.txt
@@ -1,6 +1,6 @@
 FIRRTL licence terms
 
-Copyright (c) 2014 - 2016 The Regents of the University of
+Copyright (c) 2014 - 2019 The Regents of the University of
 California (Regents). All Rights Reserved.  Redistribution and use in
 source and binary forms, with or without modification, are permitted
 provided that the following conditions are met:
-- 
cgit v1.2.3