Merge pull request Praqma#5 from MadsNielsen/JENKINS-23653

Implemented JENKINS-23653
jenkinsci · Aug 11, 2014 · 929c7f4 · 929c7f4
2 parents c02f4b1 + e1837eb
commit 929c7f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <powermock.version>1.4.12</powermock.version>
-        <cool.version>0.6.29</cool.version>
+        <cool.version>0.6.30-SNAPSHOT</cool.version>
         <praqmajutils.version>0.1.33</praqmajutils.version>
     </properties>
 

diff --git a/src/main/java/net/praqma/jenkins/configrotator/scm/clearcaseucm/PrepareWorkspace.java b/src/main/java/net/praqma/jenkins/configrotator/scm/clearcaseucm/PrepareWorkspace.java
@@ -100,7 +100,7 @@ public SnapshotView invoke(File workspace, VirtualChannel channel) throws IOExce
             }
             try {
                 view = new GetView(viewroot, viewtag).setStream(devStream).createIfAbsent().get();
-                new UpdateView(view).setLoadRules(new SnapshotView.LoadRules(view, SnapshotView.Components.ALL)).generate().update();
+                new UpdateView(view).setLoadRules(new SnapshotView.LoadRules2(view, SnapshotView.Components.ALL)).generate().update();
             } catch (ClearCaseException e) {
                 log.log(Level.WARNING, "Failed to update view, exception to follow", e);
                 throw new IOException("Unable to create view", e);

diff --git a/src/test/java/net/praqma/jenkins/configrotator/functional/scm/clearcase/FB8790.java b/src/test/java/net/praqma/jenkins/configrotator/functional/scm/clearcase/FB8790.java
@@ -141,7 +141,7 @@ public void testView() throws IOException, ClearCaseException, InterruptedExcept
         GetView gv = new GetView( path, viewTag ).createIfAbsent().setStream( container );
         SnapshotView view = gv.get();
 
-        SnapshotView.LoadRules lr = new SnapshotView.LoadRules( view, SnapshotView.Components.ALL );
+        SnapshotView.LoadRules2 lr = new SnapshotView.LoadRules2( view, SnapshotView.Components.ALL );
         new UpdateView( view ).setLoadRules( lr ).update();
 
         /* Verify first */