Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.emf.validation.ocl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.emf.validation.ui.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.emf.validation.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.emf.validation/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.emf.validation; singleton:=true
Bundle-Version: 1.9.0.qualifier
Bundle-Version: 1.9.1.qualifier
Bundle-Activator: org.eclipse.emf.validation.internal.EMFModelValidationPlugin$Implementation
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.emf.validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
<artifactId>org.eclipse.emf.validation</artifactId>
<version>1.9.0-SNAPSHOT</version>
<version>1.9.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion doc/org.eclipse.emf.validation.doc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.emf.validation.examples.ocl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.emf.validation.examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.validation-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<feature
id="org.eclipse.emf.validation"
label="%featureName"
version="1.14.1.qualifier"
version="1.14.2.qualifier"
provider-name="%providerName"
image="modeling32.png"
license-feature="org.eclipse.license"
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.emf.validation-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.features</groupId>
<artifactId>org.eclipse.emf.validation</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.eclipse.emf.validation.doc"
label="%featureName"
version="1.14.1.qualifier"
version="1.14.2.qualifier"
provider-name="%providerName"
image="modeling32.png"
license-feature="org.eclipse.license"
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.emf.validation.doc-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.features</groupId>
<artifactId>org.eclipse.emf.validation.doc</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.eclipse.emf.validation.examples"
label="%featureName"
version="1.14.1.qualifier"
version="1.14.2.qualifier"
provider-name="%providerName"
image="modeling32.png"
license-feature="org.eclipse.license"
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.emf.validation.examples-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.features</groupId>
<artifactId>org.eclipse.emf.validation.examples</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.eclipse.emf.validation.master"
label="%featureName"
version="1.14.1.qualifier"
version="1.14.2.qualifier"
provider-name="%providerName"
image="modeling32.png"
license-feature="org.eclipse.license"
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.emf.validation.master-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.features</groupId>
<artifactId>org.eclipse.emf.validation.master</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.eclipse.emf.validation.ocl"
label="%featureName"
version="1.14.1.qualifier"
version="1.14.2.qualifier"
provider-name="%providerName"
image="modeling32.png"
license-feature="org.eclipse.license"
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.emf.validation.ocl-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.features</groupId>
<artifactId>org.eclipse.emf.validation.ocl</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.eclipse.emf.validation.sdk"
label="%featureName"
version="1.14.1.qualifier"
version="1.14.2.qualifier"
provider-name="%providerName"
image="modeling32.png"
license-feature="org.eclipse.license"
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.emf.validation.sdk-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.features</groupId>
<artifactId>org.eclipse.emf.validation.sdk</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.eclipse.emf.validation.tests"
label="%featureName"
version="1.14.1.qualifier"
version="1.14.2.qualifier"
provider-name="%providerName"
image="modeling32.png"
license-feature="org.eclipse.license"
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.emf.validation.tests-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.features</groupId>
<artifactId>org.eclipse.emf.validation.tests</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.top</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.eclipse.emf.validation.releng/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>pom</packaging>

<!-- this is the parent POM from which all modules inherit common settings -->
Expand Down Expand Up @@ -90,7 +90,7 @@
<artifact>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.target</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<classifier>${platform}</classifier>
</artifact>
</target>
Expand Down
20 changes: 10 additions & 10 deletions releng/org.eclipse.emf.validation.repository/category.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.eclipse.emf.validation_1.14.1.qualifier.jar" id="org.eclipse.emf.validation" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation_1.14.2.qualifier.jar" id="org.eclipse.emf.validation" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.doc_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.doc" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.doc_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.doc" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.examples_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.examples" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.examples_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.examples" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.examples.source_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.examples.source" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.examples.source_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.examples.source" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.master_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.master" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.master_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.master" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.ocl_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.ocl" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.ocl_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.ocl" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.ocl.source_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.ocl.source" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.ocl.source_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.ocl.source" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.sdk_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.sdk" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.sdk_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.sdk" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.source_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.source" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.source_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.source" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<feature url="features/org.eclipse.emf.validation.tests_1.14.1.qualifier.jar" id="org.eclipse.emf.validation.tests" version="1.14.1.qualifier">
<feature url="features/org.eclipse.emf.validation.tests_1.14.2.qualifier.jar" id="org.eclipse.emf.validation.tests" version="1.14.2.qualifier">
<category name="emf-validation"/>
</feature>
<category-def name="emf-validation" label="EMF Validation">
Expand Down
4 changes: 2 additions & 2 deletions releng/org.eclipse.emf.validation.repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.repository</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
</project>
4 changes: 2 additions & 2 deletions releng/org.eclipse.emf.validation.target/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
<artifactId>org.eclipse.emf.validation.target</artifactId>
<groupId>org.eclipse.emf.validation</groupId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>

<properties>
<build-helper-version>3.6.1</build-helper-version>
Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.emf.validation.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.validation</groupId>
<artifactId>org.eclipse.emf.validation.releng</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.14.2-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.emf.validation.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void test_getNotificationGenerators_177647() {

@Test
public void test_getNotificationGenerator_177647() {
INotificationGenerator generator = EventTypeService.getInstance().getNotificationGenerator("Special Order"); //$NON-NLS-1$
INotificationGenerator generator = EventTypeService.getInstance().getNotificationGenerator("Special Order");
assertNotNull(generator);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class AllTests {
// register the .ordersystem extension for loading the example XMI file
Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
Map<String, Object> m = reg.getExtensionToFactoryMap();
m.put("ordersystem", new XMIResourceFactoryImpl()); //$NON-NLS-1$
m.put("ordersystem", new XMIResourceFactoryImpl());
}

/**
Expand All @@ -43,14 +43,4 @@ public static boolean isExecutingUnitTests() {
return executingUnitTests;
}

// public static Test suite() {
// // Show validation problems on the console.
// Preferences mslui = Platform.getPreferencesService().getRootNode().node("instance").node("org.eclipse.gmf.runtime.emf.ui");
// mslui.putInt("Validation.liveProblemsDisplay", 1);
// try {
// mslui.flush();
// } catch (BackingStoreException e) {
// e.printStackTrace();
// }
// }
}