Skip to content
Permalink
Browse files

Merge pull request Praqma#6 from MadsNielsen/JENKINS-26623

Updated cool to 0.6.37, fixes JENKINS-26623
  • Loading branch information
MadsNielsen committed Jan 29, 2015
2 parents 040f4ef + d22d9ba commit b49616fec3acee1b7bede2eb8a97710ab4ed9aef
@@ -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>

@@ -189,7 +189,7 @@ public String getDescription( AbstractBuild<?, ?> build ) {
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 );
@@ -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);
@@ -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 ) ).

0 comments on commit b49616f

Please sign in to comment.
You can’t perform that action at this time.