Skip to content

Commit cc0320f

Browse files
kat-cokat-co
committed
Moved jujuversion back to version package.
1 parent 5e0b70a commit cc0320f

File tree

86 files changed

+82
-82
lines changed

Some content is hidden

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

86 files changed

+82
-82
lines changed

‎agent/agent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
"github.com/juju/juju/agent"
1818
"github.com/juju/juju/api"
1919
"github.com/juju/juju/apiserver/params"
20-
"github.com/juju/juju/jujuversion"
2120
"github.com/juju/juju/mongo"
2221
"github.com/juju/juju/network"
2322
"github.com/juju/juju/state/multiwatcher"
2423
"github.com/juju/juju/testing"
24+
jujuversion "github.com/juju/juju/version"
2525
)
2626

2727
type suite struct {

‎agent/bootstrap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import (
2121
"github.com/juju/juju/environs"
2222
"github.com/juju/juju/environs/config"
2323
"github.com/juju/juju/instance"
24-
"github.com/juju/juju/jujuversion"
2524
"github.com/juju/juju/mongo"
2625
"github.com/juju/juju/network"
2726
"github.com/juju/juju/provider/dummy"
2827
"github.com/juju/juju/state"
2928
"github.com/juju/juju/state/multiwatcher"
3029
"github.com/juju/juju/testing"
30+
jujuversion "github.com/juju/juju/version"
3131
)
3232

3333
type bootstrapSuite struct {

‎agent/format_whitebox_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515

1616
"github.com/juju/juju/apiserver/params"
1717
"github.com/juju/juju/cloudconfig/cloudinit"
18-
"github.com/juju/juju/jujuversion"
1918
"github.com/juju/juju/state/multiwatcher"
2019
"github.com/juju/juju/testing"
20+
jujuversion "github.com/juju/juju/version"
2121
)
2222

2323
type formatSuite struct {

‎agent/identity_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
gc "gopkg.in/check.v1"
1515

1616
"github.com/juju/juju/apiserver/params"
17-
"github.com/juju/juju/jujuversion"
1817
"github.com/juju/juju/testing"
18+
jujuversion "github.com/juju/juju/version"
1919
)
2020

2121
type identitySuite struct {

‎api/apiclient_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/juju/juju/api"
1919
"github.com/juju/juju/apiserver/params"
2020
jujutesting "github.com/juju/juju/juju/testing"
21-
"github.com/juju/juju/jujuversion"
2221
"github.com/juju/juju/rpc"
22+
jujuversion "github.com/juju/juju/version"
2323
)
2424

2525
type apiclientSuite struct {

‎api/provisioner/provisioner_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ import (
3030
"github.com/juju/juju/feature"
3131
"github.com/juju/juju/instance"
3232
"github.com/juju/juju/juju/testing"
33-
"github.com/juju/juju/jujuversion"
3433
"github.com/juju/juju/mongo"
3534
"github.com/juju/juju/network"
3635
"github.com/juju/juju/state"
3736
"github.com/juju/juju/storage/poolmanager"
3837
"github.com/juju/juju/storage/provider"
3938
coretools "github.com/juju/juju/tools"
39+
jujuversion "github.com/juju/juju/version"
4040
"github.com/juju/juju/watcher/watchertest"
4141
)
4242

‎api/upgrader/unitupgrader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"github.com/juju/juju/api/upgrader"
1717
"github.com/juju/juju/apiserver/params"
1818
jujutesting "github.com/juju/juju/juju/testing"
19-
"github.com/juju/juju/jujuversion"
2019
"github.com/juju/juju/state"
2120
"github.com/juju/juju/tools"
21+
jujuversion "github.com/juju/juju/version"
2222
"github.com/juju/juju/watcher/watchertest"
2323
)
2424

‎apiserver/admin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
"github.com/juju/juju/apiserver/authentication"
1515
"github.com/juju/juju/apiserver/common"
1616
"github.com/juju/juju/apiserver/params"
17-
"github.com/juju/juju/jujuversion"
1817
"github.com/juju/juju/rpc"
1918
"github.com/juju/juju/rpc/rpcreflect"
2019
"github.com/juju/juju/state"
2120
"github.com/juju/juju/state/presence"
21+
jujuversion "github.com/juju/juju/version"
2222
)
2323

2424
type adminApiFactory func(srv *Server, root *apiHandler, reqNotifier *requestNotifier) interface{}

‎apiserver/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"github.com/juju/juju/environs/config"
2222
"github.com/juju/juju/environs/manual"
2323
"github.com/juju/juju/instance"
24-
"github.com/juju/juju/jujuversion"
2524
"github.com/juju/juju/network"
2625
"github.com/juju/juju/state"
26+
jujuversion "github.com/juju/juju/version"
2727
)
2828

2929
func init() {

‎apiserver/client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ import (
3030
"github.com/juju/juju/environs/manual"
3131
toolstesting "github.com/juju/juju/environs/tools/testing"
3232
"github.com/juju/juju/instance"
33-
"github.com/juju/juju/jujuversion"
3433
"github.com/juju/juju/network"
3534
"github.com/juju/juju/rpc"
3635
"github.com/juju/juju/state"
3736
"github.com/juju/juju/state/multiwatcher"
3837
"github.com/juju/juju/state/presence"
3938
coretesting "github.com/juju/juju/testing"
4039
"github.com/juju/juju/testing/factory"
40+
jujuversion "github.com/juju/juju/version"
4141
)
4242

4343
type Killer interface {

‎apiserver/client/perm_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"github.com/juju/juju/api/service"
1919
"github.com/juju/juju/apiserver/params"
2020
"github.com/juju/juju/constraints"
21-
"github.com/juju/juju/jujuversion"
2221
"github.com/juju/juju/rpc"
2322
"github.com/juju/juju/state"
23+
jujuversion "github.com/juju/juju/version"
2424
)
2525

2626
type permSuite struct {

‎apiserver/common/tools_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
apiservertesting "github.com/juju/juju/apiserver/testing"
2020
"github.com/juju/juju/environs"
2121
"github.com/juju/juju/juju/testing"
22-
"github.com/juju/juju/jujuversion"
2322
"github.com/juju/juju/network"
2423
"github.com/juju/juju/state"
2524
"github.com/juju/juju/state/toolstorage"
2625
coretools "github.com/juju/juju/tools"
26+
jujuversion "github.com/juju/juju/version"
2727
)
2828

2929
type toolsSuite struct {

‎apiserver/modelmanager/modelmanager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/juju/juju/apiserver/params"
1919
"github.com/juju/juju/environs"
2020
"github.com/juju/juju/environs/config"
21-
"github.com/juju/juju/jujuversion"
2221
"github.com/juju/juju/state"
22+
jujuversion "github.com/juju/juju/version"
2323
)
2424

2525
var logger = loggo.GetLogger("juju.apiserver.modelmanager")

‎apiserver/modelmanager/modelmanager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/juju/juju/environs"
1717
"github.com/juju/juju/environs/config"
1818
jujutesting "github.com/juju/juju/juju/testing"
19-
"github.com/juju/juju/jujuversion"
19+
jujuversion "github.com/juju/juju/version"
2020
// Register the providers for the field check test
2121
_ "github.com/juju/juju/provider/azure"
2222
_ "github.com/juju/juju/provider/ec2"

‎apiserver/service/charmstore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020

2121
"github.com/juju/juju/apiserver/params"
2222
"github.com/juju/juju/environs/config"
23-
"github.com/juju/juju/jujuversion"
2423
"github.com/juju/juju/state"
24+
jujuversion "github.com/juju/juju/version"
2525
)
2626

2727
// TODO - we really want to avoid this, which we can do by refactoring code requiring this

‎apiserver/service/service_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"github.com/juju/juju/constraints"
2727
"github.com/juju/juju/instance"
2828
jujutesting "github.com/juju/juju/juju/testing"
29-
"github.com/juju/juju/jujuversion"
3029
"github.com/juju/juju/state"
3130
statestorage "github.com/juju/juju/state/storage"
3231
"github.com/juju/juju/storage"
@@ -35,6 +34,7 @@ import (
3534
"github.com/juju/juju/storage/provider/registry"
3635
"github.com/juju/juju/testcharms"
3736
"github.com/juju/juju/testing/factory"
37+
jujuversion "github.com/juju/juju/version"
3838
)
3939

4040
type serviceSuite struct {

‎apiserver/tools_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
envtesting "github.com/juju/juju/environs/testing"
2727
envtools "github.com/juju/juju/environs/tools"
2828
toolstesting "github.com/juju/juju/environs/tools/testing"
29-
"github.com/juju/juju/jujuversion"
3029
"github.com/juju/juju/state"
3130
"github.com/juju/juju/state/toolstorage"
3231
"github.com/juju/juju/testing"
3332
coretools "github.com/juju/juju/tools"
33+
jujuversion "github.com/juju/juju/version"
3434
)
3535

3636
// charmsCommonSuite wraps authHttpSuite and adds

‎apiserver/upgrader/unitupgrader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
apiservertesting "github.com/juju/juju/apiserver/testing"
1818
"github.com/juju/juju/apiserver/upgrader"
1919
jujutesting "github.com/juju/juju/juju/testing"
20-
"github.com/juju/juju/jujuversion"
2120
"github.com/juju/juju/state"
2221
statetesting "github.com/juju/juju/state/testing"
2322
"github.com/juju/juju/tools"
23+
jujuversion "github.com/juju/juju/version"
2424
)
2525

2626
type unitUpgraderSuite struct {

‎apiserver/upgrader/upgrader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"github.com/juju/juju/apiserver/common"
1313
"github.com/juju/juju/apiserver/params"
1414
"github.com/juju/juju/environs/config"
15-
"github.com/juju/juju/jujuversion"
1615
"github.com/juju/juju/state"
1716
"github.com/juju/juju/state/watcher"
17+
jujuversion "github.com/juju/juju/version"
1818
)
1919

2020
var logger = loggo.GetLogger("juju.apiserver.upgrader")

‎apiserver/upgrader/upgrader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
apiservertesting "github.com/juju/juju/apiserver/testing"
2020
"github.com/juju/juju/apiserver/upgrader"
2121
jujutesting "github.com/juju/juju/juju/testing"
22-
"github.com/juju/juju/jujuversion"
2322
"github.com/juju/juju/state"
2423
statetesting "github.com/juju/juju/state/testing"
2524
coretesting "github.com/juju/juju/testing"
25+
jujuversion "github.com/juju/juju/version"
2626
)
2727

2828
type upgraderSuite struct {

‎cmd/juju/commands/bootstrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
"github.com/juju/juju/juju"
3434
"github.com/juju/juju/juju/osenv"
3535
"github.com/juju/juju/jujuclient"
36-
"github.com/juju/juju/jujuversion"
3736
"github.com/juju/juju/network"
37+
jujuversion "github.com/juju/juju/version"
3838
)
3939

4040
// provisionalProviders is the names of providers that are hidden behind

‎cmd/juju/commands/bootstrap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ import (
4444
"github.com/juju/juju/juju/osenv"
4545
"github.com/juju/juju/jujuclient"
4646
"github.com/juju/juju/jujuclient/jujuclienttesting"
47-
"github.com/juju/juju/jujuversion"
4847
"github.com/juju/juju/network"
4948
"github.com/juju/juju/provider/dummy"
5049
coretesting "github.com/juju/juju/testing"
5150
coretools "github.com/juju/juju/tools"
51+
jujuversion "github.com/juju/juju/version"
5252
)
5353

5454
type BootstrapSuite struct {

‎cmd/juju/commands/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"github.com/juju/juju/cmd/modelcmd"
3636
"github.com/juju/juju/juju"
3737
"github.com/juju/juju/juju/osenv"
38-
"github.com/juju/juju/jujuversion"
38+
jujuversion "github.com/juju/juju/version"
3939
// Import the providers.
4040
_ "github.com/juju/juju/provider/all"
4141
)

‎cmd/juju/commands/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"github.com/juju/juju/cmd/modelcmd"
2828
cmdtesting "github.com/juju/juju/cmd/testing"
2929
"github.com/juju/juju/juju/osenv"
30-
"github.com/juju/juju/jujuversion"
3130
_ "github.com/juju/juju/provider/dummy"
3231
"github.com/juju/juju/testing"
32+
jujuversion "github.com/juju/juju/version"
3333
)
3434

3535
type MainSuite struct {

‎cmd/juju/commands/synctools_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
envtools "github.com/juju/juju/environs/tools"
2626
"github.com/juju/juju/jujuclient"
2727
"github.com/juju/juju/jujuclient/jujuclienttesting"
28-
"github.com/juju/juju/jujuversion"
2928
coretesting "github.com/juju/juju/testing"
3029
coretools "github.com/juju/juju/tools"
30+
jujuversion "github.com/juju/juju/version"
3131
)
3232

3333
type syncToolsSuite struct {

‎cmd/juju/commands/upgradejuju.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/juju/juju/cmd/modelcmd"
2424
"github.com/juju/juju/environs/config"
2525
"github.com/juju/juju/environs/sync"
26-
"github.com/juju/juju/jujuversion"
2726
coretools "github.com/juju/juju/tools"
27+
jujuversion "github.com/juju/juju/version"
2828
)
2929

3030
func newUpgradeJujuCommand(minUpgradeVers map[int]version.Number) cmd.Command {

‎cmd/juju/commands/upgradejuju_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import (
2929
"github.com/juju/juju/environs/tools"
3030
toolstesting "github.com/juju/juju/environs/tools/testing"
3131
jujutesting "github.com/juju/juju/juju/testing"
32-
"github.com/juju/juju/jujuversion"
3332
"github.com/juju/juju/network"
3433
_ "github.com/juju/juju/provider/dummy"
3534
"github.com/juju/juju/state"
3635
coretesting "github.com/juju/juju/testing"
3736
coretools "github.com/juju/juju/tools"
37+
jujuversion "github.com/juju/juju/version"
3838
)
3939

4040
type UpgradeJujuSuite struct {

‎cmd/juju/status/status_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
"github.com/juju/juju/instance"
2727
"github.com/juju/juju/juju/osenv"
2828
"github.com/juju/juju/juju/testing"
29-
"github.com/juju/juju/jujuversion"
3029
"github.com/juju/juju/network"
3130
"github.com/juju/juju/state"
3231
"github.com/juju/juju/state/multiwatcher"
3332
"github.com/juju/juju/state/presence"
3433
"github.com/juju/juju/testcharms"
3534
coretesting "github.com/juju/juju/testing"
35+
jujuversion "github.com/juju/juju/version"
3636
)
3737

3838
func nextVersion() version.Number {

‎cmd/jujud/agent/machine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ import (
5757
"github.com/juju/juju/instance"
5858
jujunames "github.com/juju/juju/juju/names"
5959
"github.com/juju/juju/juju/paths"
60-
"github.com/juju/juju/jujuversion"
6160
"github.com/juju/juju/mongo"
6261
"github.com/juju/juju/network"
6362
"github.com/juju/juju/service"
@@ -67,6 +66,7 @@ import (
6766
statestorage "github.com/juju/juju/state/storage"
6867
"github.com/juju/juju/storage/looputil"
6968
"github.com/juju/juju/upgrades"
69+
jujuversion "github.com/juju/juju/version"
7070
"github.com/juju/juju/watcher"
7171
"github.com/juju/juju/worker"
7272
"github.com/juju/juju/worker/addresser"

‎cmd/jujud/agent/machine_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import (
5858
"github.com/juju/juju/instance"
5959
"github.com/juju/juju/juju"
6060
jujutesting "github.com/juju/juju/juju/testing"
61-
"github.com/juju/juju/jujuversion"
6261
"github.com/juju/juju/mongo"
6362
"github.com/juju/juju/network"
6463
"github.com/juju/juju/provider/dummy"
@@ -69,6 +68,7 @@ import (
6968
coretesting "github.com/juju/juju/testing"
7069
"github.com/juju/juju/testing/factory"
7170
"github.com/juju/juju/tools"
71+
jujuversion "github.com/juju/juju/version"
7272
"github.com/juju/juju/worker"
7373
"github.com/juju/juju/worker/addresser"
7474
"github.com/juju/juju/worker/apicaller"

‎cmd/jujud/agent/testing/agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import (
2828
envtesting "github.com/juju/juju/environs/testing"
2929
envtools "github.com/juju/juju/environs/tools"
3030
"github.com/juju/juju/juju/testing"
31-
"github.com/juju/juju/jujuversion"
3231
"github.com/juju/juju/mongo"
3332
"github.com/juju/juju/network"
3433
"github.com/juju/juju/state"
3534
coretesting "github.com/juju/juju/testing"
3635
coretools "github.com/juju/juju/tools"
36+
jujuversion "github.com/juju/juju/version"
3737
"github.com/juju/juju/worker/peergrouper"
3838
)
3939

‎cmd/jujud/agent/unit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/juju/juju/agent"
2020
"github.com/juju/juju/cmd/jujud/agent/unit"
2121
cmdutil "github.com/juju/juju/cmd/jujud/util"
22-
"github.com/juju/juju/jujuversion"
2322
"github.com/juju/juju/network"
23+
jujuversion "github.com/juju/juju/version"
2424
"github.com/juju/juju/worker"
2525
"github.com/juju/juju/worker/dependency"
2626
"github.com/juju/juju/worker/logsender"

0 commit comments

Comments
 (0)