Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve itest.bndrun for Jollyday downgrade #6359

Merged
merged 3 commits into from
Nov 9, 2019
Merged

Resolve itest.bndrun for Jollyday downgrade #6359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d1c39d
Resolve itest.bndrun for Jollyday downgrade
wborn Nov 8, 2019
3459cc1
Tune unrelated XML comment for full build
wborn Nov 8, 2019
16c5593
Fix unrelated SAT issue for full build
wborn Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...rm.map/src/test/java/org/openhab/transform/map/internal/MapTransformationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.osgi.framework.BundleContext;

/**
* @author Gaël L'hopital
* @author Gaël L'hopital - Initial contribution
*/
public class MapTransformationServiceTest {

Expand Down Expand Up @@ -91,7 +91,6 @@ public void tearDown() throws IOException {

@Test
public void testTransformByMap() throws Exception {

// Test that we find a translation in an existing file
String transformedResponse = processor.transform(EXISTING_FILENAME_DE, SOURCE_CLOSED);
Assert.assertEquals("zu", transformedResponse);
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.io.hueemulation.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Fragment-Host: org.openhab.io.hueemulation
tec.uom.se;version='[1.0.10,1.0.11)',\
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
3 changes: 1 addition & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,7 @@ Import-Package: \\
</executions>
</plugin>

<!-- This plugin's configuration is used to store Eclipse m2e settings
only. -->
<!-- This plugin's configuration is used to store Eclipse m2e settings only. -->
<!-- It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
Expand Down