Skip to content

Commit

Permalink
Merge pull request #2 from nmishkin/m2e12
Browse files Browse the repository at this point in the history 
Support for m2e 1.2.0 + project version bump.
  • Loading branch information
@rkrzewski
rkrzewski committed Nov 27, 2012
2 parents ba79889 + 89bbc9b commit 5318c6c
Show file tree
Hide file tree
Showing 63 changed files with 150 additions and 135 deletions.
6 changes: 3 additions & 3 deletions ...ector-module-archetype/src/main/resources/archetype-resources/plugin/META-INF/MANIFEST.MF
View file
Expand Up @@ -8,6 +8,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)"
org.eclipse.m2e.jdt;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,2.0.0)"
8 changes: 4 additions & 4 deletions ...nector-module-archetype/src/main/resources/archetype-resources/tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,9 +9,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
org.eclipse.jdt.core;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,2.0.0)",
org.junit;bundle-version="3.8.2",
${package};bundle-version="1.0.0"
24 changes: 12 additions & 12 deletions connectors/eclipse-repository/category.xml
View file
Expand Up @@ -13,28 +13,28 @@
-->
<site>
<feature url="features/org.objectledge.maven.connectors.javacc_1.1.0.qualifier.jar"
id="org.objectledge.maven.connectors.javacc.feature" version="1.1.0.qualifier">
<feature url="features/org.objectledge.maven.connectors.javacc_1.2.0.qualifier.jar"
id="org.objectledge.maven.connectors.javacc.feature" version="1.2.0.qualifier">
<category name="org.objectledge.maven.connectors"/>
</feature>
<feature url="features/org.objectledge.maven.connectors.jflex_1.1.0.qualifier.jar"
id="org.objectledge.maven.connectors.jflex.feature" version="1.1.0.qualifier">
<feature url="features/org.objectledge.maven.connectors.jflex_1.2.0.qualifier.jar"
id="org.objectledge.maven.connectors.jflex.feature" version="1.2.0.qualifier">
<category name="org.objectledge.maven.connectors"/>
</feature>
<feature url="features/org.objectledge.maven.connectors.scm_1.1.0.qualifier.jar"
id="org.objectledge.maven.connectors.scm.feature" version="1.1.0.qualifier">
<feature url="features/org.objectledge.maven.connectors.scm_1.2.0.qualifier.jar"
id="org.objectledge.maven.connectors.scm.feature" version="1.2.0.qualifier">
<category name="org.objectledge.maven.connectors"/>
</feature>
<feature url="features/org.objectledge.maven.connectors.jsc_1.1.0.qualifier.jar"
id="org.objectledge.maven.connectors.jsc.feature" version="1.1.0.qualifier">
<feature url="features/org.objectledge.maven.connectors.jsc_1.2.0.qualifier.jar"
id="org.objectledge.maven.connectors.jsc.feature" version="1.2.0.qualifier">
<category name="org.objectledge.maven.connectors"/>
</feature>
<feature url="features/org.objectledge.maven.connectors.ckpackager_1.1.0.qualifier.jar"
id="org.objectledge.maven.connectors.ckpackager.feature" version="1.1.0.qualifier">
<feature url="features/org.objectledge.maven.connectors.ckpackager_1.2.0.qualifier.jar"
id="org.objectledge.maven.connectors.ckpackager.feature" version="1.2.0.qualifier">
<category name="org.objectledge.maven.connectors"/>
</feature>
<feature url="features/org.objectledge.maven.connectors.coral_1.1.0.qualifier.jar"
id="org.objectledge.maven.connectors.coral.feature" version="1.1.0.qualifier">
<feature url="features/org.objectledge.maven.connectors.coral_1.2.0.qualifier.jar"
id="org.objectledge.maven.connectors.coral.feature" version="1.2.0.qualifier">
<category name="org.objectledge.maven.connectors"/>
</feature>
<category-def name="org.objectledge.maven.connectors" label="objectledge.org m2e connectors"/>
Expand Down
2 changes: 1 addition & 1 deletion connectors/eclipse-repository/pom.xml
View file
Expand Up @@ -22,7 +22,7 @@
</parent>

<artifactId>eclipse-repository</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<name>Eclipse repository</name>
Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/ckpackager/feature/feature.xml
View file
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.objectledge.maven.connectors.ckpackager.feature"
label="m2e connector for ckpackager-maven-plugin"
version="1.1.0.qualifier"
version="1.2.0.qualifier"
provider-name="ObjectLedge.org">

<description url="http://objectledge.org/confluence/display/TOOLS/ckpackager-maven-plugin+connector">
Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/ckpackager/feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.ckpackager</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
10 changes: 5 additions & 5 deletions connectors/modules/ckpackager/plugin/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,16 +2,16 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: m2e connector for ckpackager-maven-plugin
Bundle-SymbolicName: org.objectledge.maven.connectors.ckpackager;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: ObjectLedge.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,2.0.0)",
org.slf4j.api;bundle-version="1.6.1"
Bundle-ClassPath: .,
jars/js-1.7R2.jar,
jars/ckpackager-library-1.1.0-SNAPSHOT.jar
jars/ckpackager-library-1.2.0-SNAPSHOT.jar
4 changes: 2 additions & 2 deletions connectors/modules/ckpackager/plugin/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.ckpackager</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -51,7 +51,7 @@
<artifactItem>
<groupId>org.objectledge.ckpackager</groupId>
<artifactId>ckpackager-library</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
</artifactItem>
</artifactItems>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/ckpackager/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@

<groupId>org.objectledge.maven.connectors.ckpackager</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>CKPackager connector</name>
Expand Down
14 changes: 7 additions & 7 deletions connectors/modules/ckpackager/tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,16 +2,16 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: tests for m2e connector for ckpackager-maven-plugin
Bundle-SymbolicName: org.objectledge.maven.connectors.ckpackager.tests;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: ObjectLedge.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
org.eclipse.jdt.core;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,1.2.0)",
org.eclipse.jdt.core;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,2.0.0)",
org.junit;bundle-version="3.8.2",
org.objectledge.maven.connectors.ckpackager;bundle-version="1.1.0"
org.objectledge.maven.connectors.ckpackager;bundle-version="1.2.0"
2 changes: 1 addition & 1 deletion connectors/modules/ckpackager/tests/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.ckpackager</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions connectors/modules/ckpackager/tests/projects/testproject-01/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.objectledge.maven.connectors.ckpackager.tests</groupId>
<artifactId>testproject-01</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>war</packaging>

<name>CKPackager connector - test project</name>
Expand All @@ -31,7 +31,7 @@
<plugin>
<groupId>org.objectledge.maven.plugins</groupId>
<artifactId>ckpackager-maven-plugin</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/coral/feature/feature.xml
View file
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.objectledge.maven.connectors.coral.feature"
label="m2e connector for coral-maven2-plugin"
version="1.1.0.qualifier"
version="1.2.0.qualifier"
provider-name="Objectedge.org">

<description url="http://objectledge.org/confluence/display/TOOLS/coral-maven2-plugin+connector">
Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/coral/feature/pom.xml
View file
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.coral</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions connectors/modules/coral/plugin/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: m2e connector for coral-maven2-plugin
Bundle-SymbolicName: org.objectledge.maven.connectors.coral;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: Objectedge.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)"
org.eclipse.m2e.jdt;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,2.0.0)"
2 changes: 1 addition & 1 deletion connectors/modules/coral/plugin/pom.xml
View file
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.coral</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/coral/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@

<groupId>org.objectledge.maven.connectors.coral</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Objectledge Coral connector</name>
Expand Down
12 changes: 6 additions & 6 deletions connectors/modules/coral/tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,16 +2,16 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: tests for m2e connector for coral-maven2-plugin
Bundle-SymbolicName: org.objectledge.maven.connectors.coral.tests;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: Objectedge.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
org.eclipse.jdt.core;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,2.0.0)",
org.junit;bundle-version="3.8.2",
org.objectledge.maven.connectors.coral;bundle-version="1.1.0"
org.objectledge.maven.connectors.coral;bundle-version="1.2.0"
2 changes: 1 addition & 1 deletion connectors/modules/coral/tests/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.coral</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/coral/tests/projects/testproject-01/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.objectledge.maven.connectors.coral.tests</groupId>
<artifactId>testproject-01</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Objectledge Coral connector - test project</name>
Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/coral/tests/projects/testproject-02/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.objectledge.maven.connectors.coral.tests</groupId>
<artifactId>testproject-02</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Objectledge Coral connector - test project</name>
Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/javacc/feature/feature.xml
View file
Expand Up @@ -15,7 +15,7 @@
<feature
id="org.objectledge.maven.connectors.javacc.feature"
label="m2e connector for javacc-maven-plugin"
version="1.1.0.qualifier"
version="1.2.0.qualifier"
provider-name="ObjectLedge.org">

<description url="http://objectledge.org/confluence/display/TOOLS/javacc-maven-plugin+connector">
Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/javacc/feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.javacc</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions connectors/modules/javacc/plugin/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: m2e connector for javacc-maven-plugin
Bundle-SymbolicName: org.objectledge.maven.connectors.javacc;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: ObjectLedge.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)"
org.eclipse.m2e.jdt;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,2.0.0)"
2 changes: 1 addition & 1 deletion connectors/modules/javacc/plugin/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.javacc</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions connectors/modules/javacc/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@

<groupId>org.objectledge.maven.connectors.javacc</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>JavaCC connector</name>
Expand All @@ -35,4 +35,4 @@
<module>feature</module>
<module>tests</module>
</modules>
</project>
</project>
12 changes: 6 additions & 6 deletions connectors/modules/javacc/tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,16 +2,16 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: tests for m2e connector for javacc-maven-plugin
Bundle-SymbolicName: org.objectledge.maven.connectors.javacc.tests;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: ObjectLedge.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
org.eclipse.jdt.core;bundle-version="3.4.0",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,1.2.0)",
org.eclipse.m2e.jdt;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,2.0.0)",
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,2.0.0)",
org.junit;bundle-version="3.8.2",
org.objectledge.maven.connectors.javacc;bundle-version="1.1.0"
org.objectledge.maven.connectors.javacc;bundle-version="1.2.0"
2 changes: 1 addition & 1 deletion connectors/modules/javacc/tests/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.objectledge.maven.connectors.javacc</groupId>
<artifactId>parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connectors/modules/javacc/tests/projects/javacc-01/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.objectledge.maven.connectors.javacc.tests</groupId>
<artifactId>javacc-01</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>JavaCC connector - JavaCC test</name>
Expand Down

0 comments on commit 5318c6c

Please sign in to comment.