Updated cool to 0.6.37, fixes JENKINS-26623

jenkinsci · Jan 29, 2015 · d22d9ba · d22d9ba
1 parent 040f4ef
commit d22d9ba
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <powermock.version>1.4.12</powermock.version>
-        <cool.version>0.6.32</cool.version>
+        <cool.version>0.6.37</cool.version>
         <praqmajutils.version>0.1.33</praqmajutils.version>
     </properties>
 

diff --git a/...ain/java/net/praqma/jenkins/configrotator/scm/clearcaseucm/ClearCaseUCMConfiguration.java b/...ain/java/net/praqma/jenkins/configrotator/scm/clearcaseucm/ClearCaseUCMConfiguration.java
@@ -189,7 +189,7 @@ public List<ConfigRotatorChangeLogEntry> difference( ClearCaseUCMConfigurationCo
             for( Activity a : activities ) {               
                 ConfigRotatorChangeLogEntry entry = new ConfigRotatorChangeLogEntry( a.getHeadline(), a.getUser(), new ArrayList<ConfigRotatorVersion>() );
                 for( Version v : a.changeset.versions ) {
-                    entry.addVersion( new ConfigRotatorVersion( v.getSFile(), v.getVersion(), v.blame() ) );
+                    entry.addVersion( new ConfigRotatorVersion( v.getSFile(), v.getVersion(), a.getUser() ) );
                 }
 
                 entries.add( entry );

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
@@ -85,7 +85,7 @@ public SnapshotView invoke(File workspace, VirtualChannel channel) throws IOExce
                 out.println(ConfigurationRotator.LOGGERNAME + "View root: " + new File(workspace, "view"));
                 out.println(ConfigurationRotator.LOGGERNAME + "View tag : " + viewtag);
                 new ConfigSpec(viewroot).addLoadRule(baselines).generate().appy();
-                new UpdateView(view).swipe().overwrite().update();
+                new UpdateView(view).setLoadRules(new SnapshotView.LoadRules2(SnapshotView.Components.ALL)).swipe().overwrite().update();
             } catch (ClearCaseException e) {
                 throw new IOException("Unable to create view", e);
             }
@@ -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.LoadRules2(view, SnapshotView.Components.ALL)).generate().update();
+                new UpdateView(view).setLoadRules(new SnapshotView.LoadRules2(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.LoadRules2 lr = new SnapshotView.LoadRules2( view, SnapshotView.Components.ALL );
+        SnapshotView.LoadRules2 lr = new SnapshotView.LoadRules2( SnapshotView.Components.ALL );
         new UpdateView( view ).setLoadRules( lr ).update();
 
         /* Verify first */
@@ -165,7 +165,7 @@ public void testView() throws IOException, ClearCaseException, InterruptedExcept
         new Rebase( container ).addBaseline( model1 ).dropFromStream().rebase( true );
         new ConfigSpec( view.getViewRoot() ).addLoadRule( model1 ).generate().appy();
 
-        new UpdateView( view ).swipe().overwrite().update();
+        new UpdateView( view ).setLoadRules(lr).swipe().overwrite().update();
 
         new SystemValidator().addElementToPathCheck( filepath, new SystemValidator.Element( "Model", true ) ).
                 addElementToPathCheck( filepath, new SystemValidator.Element( "Clientapp", false ) ).