From e6aa5ce56e75b982b95438aa206a3fec3fcff5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Lara=20G=C3=B3mez?= Date: Thu, 4 Jul 2013 10:18:56 +0200 Subject: [PATCH 1/4] bump to m2e 1.4.0 --- connectors/eclipse-repository/category.xml | 24 +++++++++---------- connectors/eclipse-repository/pom.xml | 4 ++-- .../modules/ckpackager/feature/feature.xml | 2 +- connectors/modules/ckpackager/feature/pom.xml | 4 ++-- .../ckpackager/plugin/META-INF/MANIFEST.MF | 4 ++-- connectors/modules/ckpackager/plugin/pom.xml | 6 ++--- connectors/modules/ckpackager/pom.xml | 2 +- .../ckpackager/tests/META-INF/MANIFEST.MF | 4 ++-- connectors/modules/ckpackager/tests/pom.xml | 2 +- .../tests/projects/testproject-01/pom.xml | 4 ++-- connectors/modules/coral/feature/pom.xml | 2 +- connectors/modules/coral/plugin/pom.xml | 2 +- connectors/modules/coral/pom.xml | 2 +- connectors/modules/coral/tests/pom.xml | 2 +- .../tests/projects/testproject-01/pom.xml | 2 +- .../tests/projects/testproject-02/pom.xml | 2 +- connectors/modules/javacc/feature/pom.xml | 2 +- connectors/modules/javacc/plugin/pom.xml | 2 +- connectors/modules/javacc/pom.xml | 2 +- connectors/modules/javacc/tests/pom.xml | 2 +- .../javacc/tests/projects/javacc-01/pom.xml | 2 +- connectors/modules/jflex/feature/pom.xml | 2 +- connectors/modules/jflex/plugin/pom.xml | 2 +- connectors/modules/jflex/pom.xml | 2 +- connectors/modules/jflex/tests/pom.xml | 2 +- .../tests/projects/testproject-01/pom.xml | 2 +- connectors/modules/jsc/feature/pom.xml | 2 +- connectors/modules/jsc/plugin/pom.xml | 2 +- connectors/modules/jsc/pom.xml | 2 +- connectors/modules/jsc/tests/pom.xml | 2 +- .../jsc/tests/projects/testproject-01/pom.xml | 2 +- connectors/modules/scm/feature/pom.xml | 2 +- connectors/modules/scm/plugin/pom.xml | 2 +- connectors/modules/scm/pom.xml | 2 +- connectors/modules/scm/tests/pom.xml | 2 +- .../scm/tests/projects/testproject-01/pom.xml | 2 +- connectors/pom.xml | 2 +- connectors/target-platform/e36-m2e130.target | 15 ++++++++++++ connectors/target-platform/pom.xml | 8 +++---- plugins/ckpackager-maven-plugin/pom.xml | 4 ++-- .../src/it/basic/pom.xml | 2 +- plugins/ckpackager/pom.xml | 4 ++-- plugins/jsc-maven-plugin/pom.xml | 2 +- .../src/it/test/interface/pom.xml | 2 +- plugins/jsc-maven-plugin/src/it/test/pom.xml | 2 +- .../jsc-maven-plugin/src/it/test/test/pom.xml | 2 +- 46 files changed, 83 insertions(+), 68 deletions(-) create mode 100644 connectors/target-platform/e36-m2e130.target diff --git a/connectors/eclipse-repository/category.xml b/connectors/eclipse-repository/category.xml index 8d5cad9..605dfae 100644 --- a/connectors/eclipse-repository/category.xml +++ b/connectors/eclipse-repository/category.xml @@ -13,28 +13,28 @@ --> - + - + - + - + - + - + diff --git a/connectors/eclipse-repository/pom.xml b/connectors/eclipse-repository/pom.xml index 44b09ca..e429a3d 100644 --- a/connectors/eclipse-repository/pom.xml +++ b/connectors/eclipse-repository/pom.xml @@ -22,10 +22,10 @@ eclipse-repository - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT eclipse-repository Eclipse repository Update site for ObjectLedge M2E connectors - \ No newline at end of file + diff --git a/connectors/modules/ckpackager/feature/feature.xml b/connectors/modules/ckpackager/feature/feature.xml index a16df65..fe96d89 100644 --- a/connectors/modules/ckpackager/feature/feature.xml +++ b/connectors/modules/ckpackager/feature/feature.xml @@ -15,7 +15,7 @@ diff --git a/connectors/modules/ckpackager/feature/pom.xml b/connectors/modules/ckpackager/feature/pom.xml index d21d054..854c8d4 100644 --- a/connectors/modules/ckpackager/feature/pom.xml +++ b/connectors/modules/ckpackager/feature/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.ckpackager parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. @@ -25,4 +25,4 @@ eclipse-feature CKPackager connector - feature - \ No newline at end of file + diff --git a/connectors/modules/ckpackager/plugin/META-INF/MANIFEST.MF b/connectors/modules/ckpackager/plugin/META-INF/MANIFEST.MF index 8a94b09..87d5378 100644 --- a/connectors/modules/ckpackager/plugin/META-INF/MANIFEST.MF +++ b/connectors/modules/ckpackager/plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0", org.slf4j.api;bundle-version="1.6.1" Bundle-ClassPath: ., jars/js-1.7R2.jar, - jars/ckpackager-library-1.2.0-SNAPSHOT.jar + jars/ckpackager-library-1.4.0-SNAPSHOT.jar diff --git a/connectors/modules/ckpackager/plugin/pom.xml b/connectors/modules/ckpackager/plugin/pom.xml index b8671d0..4cf193f 100644 --- a/connectors/modules/ckpackager/plugin/pom.xml +++ b/connectors/modules/ckpackager/plugin/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.ckpackager parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. @@ -51,7 +51,7 @@ org.objectledge.ckpackager ckpackager-library - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT @@ -102,4 +102,4 @@ - \ No newline at end of file + diff --git a/connectors/modules/ckpackager/pom.xml b/connectors/modules/ckpackager/pom.xml index 94092b1..03aa598 100644 --- a/connectors/modules/ckpackager/pom.xml +++ b/connectors/modules/ckpackager/pom.xml @@ -23,7 +23,7 @@ org.objectledge.maven.connectors.ckpackager parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT pom CKPackager connector diff --git a/connectors/modules/ckpackager/tests/META-INF/MANIFEST.MF b/connectors/modules/ckpackager/tests/META-INF/MANIFEST.MF index f8b1c17..478d640 100644 --- a/connectors/modules/ckpackager/tests/META-INF/MANIFEST.MF +++ b/connectors/modules/ckpackager/tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.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.2.0" + org.objectledge.maven.connectors.ckpackager;bundle-version="1.4.0" diff --git a/connectors/modules/ckpackager/tests/pom.xml b/connectors/modules/ckpackager/tests/pom.xml index 80d3a17..739f0b0 100644 --- a/connectors/modules/ckpackager/tests/pom.xml +++ b/connectors/modules/ckpackager/tests/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.ckpackager parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/ckpackager/tests/projects/testproject-01/pom.xml b/connectors/modules/ckpackager/tests/projects/testproject-01/pom.xml index 8fd69bb..3648201 100644 --- a/connectors/modules/ckpackager/tests/projects/testproject-01/pom.xml +++ b/connectors/modules/ckpackager/tests/projects/testproject-01/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.ckpackager.tests testproject-01 - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT war CKPackager connector - test project @@ -31,7 +31,7 @@ org.objectledge.maven.plugins ckpackager-maven-plugin - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/connectors/modules/coral/feature/pom.xml b/connectors/modules/coral/feature/pom.xml index ce5003e..caef0db 100644 --- a/connectors/modules/coral/feature/pom.xml +++ b/connectors/modules/coral/feature/pom.xml @@ -18,7 +18,7 @@ org.objectledge.maven.connectors.coral parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/coral/plugin/pom.xml b/connectors/modules/coral/plugin/pom.xml index 8dc2846..c0958f5 100644 --- a/connectors/modules/coral/plugin/pom.xml +++ b/connectors/modules/coral/plugin/pom.xml @@ -18,7 +18,7 @@ org.objectledge.maven.connectors.coral parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/coral/pom.xml b/connectors/modules/coral/pom.xml index 5768ea5..ea16693 100644 --- a/connectors/modules/coral/pom.xml +++ b/connectors/modules/coral/pom.xml @@ -24,7 +24,7 @@ org.objectledge.maven.connectors.coral parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT pom Objectledge Coral connector diff --git a/connectors/modules/coral/tests/pom.xml b/connectors/modules/coral/tests/pom.xml index 953bad6..58be6da 100644 --- a/connectors/modules/coral/tests/pom.xml +++ b/connectors/modules/coral/tests/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.coral parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/coral/tests/projects/testproject-01/pom.xml b/connectors/modules/coral/tests/projects/testproject-01/pom.xml index f145b3a..e4efbc5 100644 --- a/connectors/modules/coral/tests/projects/testproject-01/pom.xml +++ b/connectors/modules/coral/tests/projects/testproject-01/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.coral.tests testproject-01 - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT jar Objectledge Coral connector - test project diff --git a/connectors/modules/coral/tests/projects/testproject-02/pom.xml b/connectors/modules/coral/tests/projects/testproject-02/pom.xml index bf22d0d..45cb043 100644 --- a/connectors/modules/coral/tests/projects/testproject-02/pom.xml +++ b/connectors/modules/coral/tests/projects/testproject-02/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.coral.tests testproject-02 - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT jar Objectledge Coral connector - test project diff --git a/connectors/modules/javacc/feature/pom.xml b/connectors/modules/javacc/feature/pom.xml index 9e9f567..e10fc2b 100644 --- a/connectors/modules/javacc/feature/pom.xml +++ b/connectors/modules/javacc/feature/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.javacc parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/javacc/plugin/pom.xml b/connectors/modules/javacc/plugin/pom.xml index 5b0428c..12cfc46 100644 --- a/connectors/modules/javacc/plugin/pom.xml +++ b/connectors/modules/javacc/plugin/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.javacc parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/javacc/pom.xml b/connectors/modules/javacc/pom.xml index d0c7ad2..069841c 100644 --- a/connectors/modules/javacc/pom.xml +++ b/connectors/modules/javacc/pom.xml @@ -23,7 +23,7 @@ org.objectledge.maven.connectors.javacc parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT pom JavaCC connector diff --git a/connectors/modules/javacc/tests/pom.xml b/connectors/modules/javacc/tests/pom.xml index 73a8100..0a70248 100644 --- a/connectors/modules/javacc/tests/pom.xml +++ b/connectors/modules/javacc/tests/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.javacc parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/javacc/tests/projects/javacc-01/pom.xml b/connectors/modules/javacc/tests/projects/javacc-01/pom.xml index 778d677..119f224 100644 --- a/connectors/modules/javacc/tests/projects/javacc-01/pom.xml +++ b/connectors/modules/javacc/tests/projects/javacc-01/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.javacc.tests javacc-01 - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT jar JavaCC connector - JavaCC test diff --git a/connectors/modules/jflex/feature/pom.xml b/connectors/modules/jflex/feature/pom.xml index fabbc41..946282c 100644 --- a/connectors/modules/jflex/feature/pom.xml +++ b/connectors/modules/jflex/feature/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.jflex parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/jflex/plugin/pom.xml b/connectors/modules/jflex/plugin/pom.xml index d96ffa8..9efdd95 100644 --- a/connectors/modules/jflex/plugin/pom.xml +++ b/connectors/modules/jflex/plugin/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.jflex parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/jflex/pom.xml b/connectors/modules/jflex/pom.xml index f473af7..c055744 100644 --- a/connectors/modules/jflex/pom.xml +++ b/connectors/modules/jflex/pom.xml @@ -23,7 +23,7 @@ org.objectledge.maven.connectors.jflex parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT pom JFlex connector diff --git a/connectors/modules/jflex/tests/pom.xml b/connectors/modules/jflex/tests/pom.xml index f307ee4..39b10d9 100644 --- a/connectors/modules/jflex/tests/pom.xml +++ b/connectors/modules/jflex/tests/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.jflex parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/jflex/tests/projects/testproject-01/pom.xml b/connectors/modules/jflex/tests/projects/testproject-01/pom.xml index 13c06e0..6cecb18 100644 --- a/connectors/modules/jflex/tests/projects/testproject-01/pom.xml +++ b/connectors/modules/jflex/tests/projects/testproject-01/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.jflex.tests testproject-01 - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT jar JFlex connector - test project diff --git a/connectors/modules/jsc/feature/pom.xml b/connectors/modules/jsc/feature/pom.xml index 5033266..ec7c629 100644 --- a/connectors/modules/jsc/feature/pom.xml +++ b/connectors/modules/jsc/feature/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.jsc parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/jsc/plugin/pom.xml b/connectors/modules/jsc/plugin/pom.xml index 448d499..643c801 100644 --- a/connectors/modules/jsc/plugin/pom.xml +++ b/connectors/modules/jsc/plugin/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.jsc parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/jsc/pom.xml b/connectors/modules/jsc/pom.xml index e836028..d121b81 100644 --- a/connectors/modules/jsc/pom.xml +++ b/connectors/modules/jsc/pom.xml @@ -23,7 +23,7 @@ org.objectledge.maven.connectors.jsc parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT pom Rhino jsc connector diff --git a/connectors/modules/jsc/tests/pom.xml b/connectors/modules/jsc/tests/pom.xml index 1c5de0e..aa8c191 100644 --- a/connectors/modules/jsc/tests/pom.xml +++ b/connectors/modules/jsc/tests/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.jsc parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/jsc/tests/projects/testproject-01/pom.xml b/connectors/modules/jsc/tests/projects/testproject-01/pom.xml index df6e871..c292c7f 100644 --- a/connectors/modules/jsc/tests/projects/testproject-01/pom.xml +++ b/connectors/modules/jsc/tests/projects/testproject-01/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.jsc.tests testproject-01 - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT jar Rhino jsc connector - test project diff --git a/connectors/modules/scm/feature/pom.xml b/connectors/modules/scm/feature/pom.xml index d22a5ae..8d6a38b 100644 --- a/connectors/modules/scm/feature/pom.xml +++ b/connectors/modules/scm/feature/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.scm parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/scm/plugin/pom.xml b/connectors/modules/scm/plugin/pom.xml index c866774..3794052 100644 --- a/connectors/modules/scm/plugin/pom.xml +++ b/connectors/modules/scm/plugin/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.scm parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/scm/pom.xml b/connectors/modules/scm/pom.xml index c832651..d3d325e 100644 --- a/connectors/modules/scm/pom.xml +++ b/connectors/modules/scm/pom.xml @@ -23,7 +23,7 @@ org.objectledge.maven.connectors.scm parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT pom Maven SCM connector diff --git a/connectors/modules/scm/tests/pom.xml b/connectors/modules/scm/tests/pom.xml index 0221cf2..1c9e9be 100644 --- a/connectors/modules/scm/tests/pom.xml +++ b/connectors/modules/scm/tests/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.scm parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/connectors/modules/scm/tests/projects/testproject-01/pom.xml b/connectors/modules/scm/tests/projects/testproject-01/pom.xml index 245e5b4..a5a03d4 100644 --- a/connectors/modules/scm/tests/projects/testproject-01/pom.xml +++ b/connectors/modules/scm/tests/projects/testproject-01/pom.xml @@ -17,7 +17,7 @@ org.objectledge.maven.connectors.scm.tests testproject-01 - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT jar Maven SCM connector - test project diff --git a/connectors/pom.xml b/connectors/pom.xml index 887a9f4..01b1424 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -77,7 +77,7 @@ org.objectledge.maven.connectors target-platform - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT e36-m2e110 diff --git a/connectors/target-platform/e36-m2e130.target b/connectors/target-platform/e36-m2e130.target new file mode 100644 index 0000000..983a942 --- /dev/null +++ b/connectors/target-platform/e36-m2e130.target @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/connectors/target-platform/pom.xml b/connectors/target-platform/pom.xml index aef167a..4f53969 100644 --- a/connectors/target-platform/pom.xml +++ b/connectors/target-platform/pom.xml @@ -23,7 +23,7 @@ org.objectledge.maven.connectors target-platform - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT pom Target plaform for ObjectLedge.org M2E connectors. @@ -45,9 +45,9 @@ - e36-m2e120.target + e36-m2e130.target target - e36-m2e120 + e36-m2e130 @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/plugins/ckpackager-maven-plugin/pom.xml b/plugins/ckpackager-maven-plugin/pom.xml index 35ce819..4604a03 100644 --- a/plugins/ckpackager-maven-plugin/pom.xml +++ b/plugins/ckpackager-maven-plugin/pom.xml @@ -22,7 +22,7 @@ ckpackager-maven-plugin - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT maven-plugin CKPackager Maven plugin @@ -37,7 +37,7 @@ org.objectledge.ckpackager ckpackager-library - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT rhino diff --git a/plugins/ckpackager-maven-plugin/src/it/basic/pom.xml b/plugins/ckpackager-maven-plugin/src/it/basic/pom.xml index 4dcb45a..065ec09 100644 --- a/plugins/ckpackager-maven-plugin/src/it/basic/pom.xml +++ b/plugins/ckpackager-maven-plugin/src/it/basic/pom.xml @@ -32,7 +32,7 @@ org.objectledge.maven.plugins ckpackager-maven-plugin - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/plugins/ckpackager/pom.xml b/plugins/ckpackager/pom.xml index 87e3223..7c995a8 100644 --- a/plugins/ckpackager/pom.xml +++ b/plugins/ckpackager/pom.xml @@ -23,7 +23,7 @@ org.objectledge.ckpackager ckpackager-library - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT jar CKPackager library @@ -47,7 +47,7 @@ org.objectledge.maven.plugins jsc-maven-plugin - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT main diff --git a/plugins/jsc-maven-plugin/pom.xml b/plugins/jsc-maven-plugin/pom.xml index 97fd06c..dd69609 100644 --- a/plugins/jsc-maven-plugin/pom.xml +++ b/plugins/jsc-maven-plugin/pom.xml @@ -23,7 +23,7 @@ jsc-maven-plugin - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT maven-plugin Rhino jsc Maven plugin diff --git a/plugins/jsc-maven-plugin/src/it/test/interface/pom.xml b/plugins/jsc-maven-plugin/src/it/test/interface/pom.xml index c1554d7..8d08651 100644 --- a/plugins/jsc-maven-plugin/src/it/test/interface/pom.xml +++ b/plugins/jsc-maven-plugin/src/it/test/interface/pom.xml @@ -19,7 +19,7 @@ org.objectledge.maven.plugins.jsc.test parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. diff --git a/plugins/jsc-maven-plugin/src/it/test/pom.xml b/plugins/jsc-maven-plugin/src/it/test/pom.xml index f9641ea..1199821 100644 --- a/plugins/jsc-maven-plugin/src/it/test/pom.xml +++ b/plugins/jsc-maven-plugin/src/it/test/pom.xml @@ -25,7 +25,7 @@ org.objectledge.maven.plugins.jsc.test parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT pom Test aggregator module diff --git a/plugins/jsc-maven-plugin/src/it/test/test/pom.xml b/plugins/jsc-maven-plugin/src/it/test/test/pom.xml index b7392fd..7b3be9d 100644 --- a/plugins/jsc-maven-plugin/src/it/test/test/pom.xml +++ b/plugins/jsc-maven-plugin/src/it/test/test/pom.xml @@ -19,7 +19,7 @@ org.objectledge.maven.plugins.jsc.test parent - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT .. From 56af6ab45dcd4a73d54aa57f39213307be3d6b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Lara=20G=C3=B3mez?= Date: Thu, 4 Jul 2013 12:58:18 +0200 Subject: [PATCH 2/4] Missing 1.4.0 bumps --- connectors/modules/coral/feature/feature.xml | 2 +- connectors/modules/coral/plugin/META-INF/MANIFEST.MF | 2 +- connectors/modules/coral/tests/META-INF/MANIFEST.MF | 4 ++-- connectors/modules/javacc/feature/feature.xml | 2 +- connectors/modules/javacc/plugin/META-INF/MANIFEST.MF | 2 +- connectors/modules/javacc/tests/META-INF/MANIFEST.MF | 4 ++-- connectors/modules/jflex/feature/feature.xml | 2 +- connectors/modules/jflex/plugin/META-INF/MANIFEST.MF | 2 +- connectors/modules/jflex/tests/META-INF/MANIFEST.MF | 4 ++-- connectors/modules/jsc/feature/feature.xml | 2 +- connectors/modules/jsc/plugin/META-INF/MANIFEST.MF | 2 +- connectors/modules/jsc/tests/META-INF/MANIFEST.MF | 4 ++-- connectors/modules/scm/feature/feature.xml | 2 +- connectors/modules/scm/plugin/META-INF/MANIFEST.MF | 2 +- connectors/modules/scm/tests/META-INF/MANIFEST.MF | 4 ++-- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/connectors/modules/coral/feature/feature.xml b/connectors/modules/coral/feature/feature.xml index 54c3657..ac7a0ac 100644 --- a/connectors/modules/coral/feature/feature.xml +++ b/connectors/modules/coral/feature/feature.xml @@ -15,7 +15,7 @@ diff --git a/connectors/modules/coral/plugin/META-INF/MANIFEST.MF b/connectors/modules/coral/plugin/META-INF/MANIFEST.MF index 300e427..2607061 100644 --- a/connectors/modules/coral/plugin/META-INF/MANIFEST.MF +++ b/connectors/modules/coral/plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: Objectedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 diff --git a/connectors/modules/coral/tests/META-INF/MANIFEST.MF b/connectors/modules/coral/tests/META-INF/MANIFEST.MF index 159c08e..4e77c26 100644 --- a/connectors/modules/coral/tests/META-INF/MANIFEST.MF +++ b/connectors/modules/coral/tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: Objectedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.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.2.0" + org.objectledge.maven.connectors.coral;bundle-version="1.4.0" diff --git a/connectors/modules/javacc/feature/feature.xml b/connectors/modules/javacc/feature/feature.xml index 6aaf4de..b4dbbbf 100644 --- a/connectors/modules/javacc/feature/feature.xml +++ b/connectors/modules/javacc/feature/feature.xml @@ -15,7 +15,7 @@ diff --git a/connectors/modules/javacc/plugin/META-INF/MANIFEST.MF b/connectors/modules/javacc/plugin/META-INF/MANIFEST.MF index 42d0643..7d02aff 100644 --- a/connectors/modules/javacc/plugin/META-INF/MANIFEST.MF +++ b/connectors/modules/javacc/plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 diff --git a/connectors/modules/javacc/tests/META-INF/MANIFEST.MF b/connectors/modules/javacc/tests/META-INF/MANIFEST.MF index 8df8f1c..f2e4e85 100644 --- a/connectors/modules/javacc/tests/META-INF/MANIFEST.MF +++ b/connectors/modules/javacc/tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.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.2.0" + org.objectledge.maven.connectors.javacc;bundle-version="1.4.0" diff --git a/connectors/modules/jflex/feature/feature.xml b/connectors/modules/jflex/feature/feature.xml index d8fa915..b00de06 100644 --- a/connectors/modules/jflex/feature/feature.xml +++ b/connectors/modules/jflex/feature/feature.xml @@ -15,7 +15,7 @@ diff --git a/connectors/modules/jflex/plugin/META-INF/MANIFEST.MF b/connectors/modules/jflex/plugin/META-INF/MANIFEST.MF index bd15fa3..c1b5d9b 100644 --- a/connectors/modules/jflex/plugin/META-INF/MANIFEST.MF +++ b/connectors/modules/jflex/plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: m2e connector for maven-jflex-plugin Bundle-SymbolicName: org.objectledge.maven.connectors.jflex;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 diff --git a/connectors/modules/jflex/tests/META-INF/MANIFEST.MF b/connectors/modules/jflex/tests/META-INF/MANIFEST.MF index 599024c..a5d4dd4 100644 --- a/connectors/modules/jflex/tests/META-INF/MANIFEST.MF +++ b/connectors/modules/jflex/tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: tests for m2e connector for maven-jflex-plugin Bundle-SymbolicName: org.objectledge.maven.connectors.jflex.tests;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.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.jflex;bundle-version="1.2.0" + org.objectledge.maven.connectors.jflex;bundle-version="1.4.0" diff --git a/connectors/modules/jsc/feature/feature.xml b/connectors/modules/jsc/feature/feature.xml index f0f5828..ad76bbf 100644 --- a/connectors/modules/jsc/feature/feature.xml +++ b/connectors/modules/jsc/feature/feature.xml @@ -15,7 +15,7 @@ diff --git a/connectors/modules/jsc/plugin/META-INF/MANIFEST.MF b/connectors/modules/jsc/plugin/META-INF/MANIFEST.MF index 5e6d0de..6596c0d 100644 --- a/connectors/modules/jsc/plugin/META-INF/MANIFEST.MF +++ b/connectors/modules/jsc/plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: m2e connector for jsc-maven-plugin Bundle-SymbolicName: org.objectledge.maven.connectors.jsc;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 diff --git a/connectors/modules/jsc/tests/META-INF/MANIFEST.MF b/connectors/modules/jsc/tests/META-INF/MANIFEST.MF index 292fd71..6a1a3d8 100644 --- a/connectors/modules/jsc/tests/META-INF/MANIFEST.MF +++ b/connectors/modules/jsc/tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: tests for m2e connector for jsc-maven-plugin Bundle-SymbolicName: org.objectledge.maven.connectors.jsc.tests;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.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.jsc;bundle-version="1.2.0" + org.objectledge.maven.connectors.jsc;bundle-version="1.4.0" diff --git a/connectors/modules/scm/feature/feature.xml b/connectors/modules/scm/feature/feature.xml index c1c3f71..d18b287 100644 --- a/connectors/modules/scm/feature/feature.xml +++ b/connectors/modules/scm/feature/feature.xml @@ -15,7 +15,7 @@ diff --git a/connectors/modules/scm/plugin/META-INF/MANIFEST.MF b/connectors/modules/scm/plugin/META-INF/MANIFEST.MF index 2cd206e..271937c 100644 --- a/connectors/modules/scm/plugin/META-INF/MANIFEST.MF +++ b/connectors/modules/scm/plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: m2e connector for maven-scm-plugin Bundle-SymbolicName: org.objectledge.maven.connectors.scm;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 diff --git a/connectors/modules/scm/tests/META-INF/MANIFEST.MF b/connectors/modules/scm/tests/META-INF/MANIFEST.MF index 069af09..b1a07d6 100644 --- a/connectors/modules/scm/tests/META-INF/MANIFEST.MF +++ b/connectors/modules/scm/tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: tests for m2e connector for maven-scm-plugin Bundle-SymbolicName: org.objectledge.maven.connectors.scm.tests;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: ObjectLedge.org Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.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.scm;bundle-version="1.2.0" + org.objectledge.maven.connectors.scm;bundle-version="1.4.0" From 783d82cac79444e359cd0ed5b5407c823328a147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Lara=20G=C3=B3mez?= Date: Thu, 4 Jul 2013 12:58:43 +0200 Subject: [PATCH 3/4] build for eclipse 4.2 --- connectors/pom.xml | 9 +++++++-- connectors/target-platform/e42-m2e140.target | 15 +++++++++++++++ connectors/target-platform/pom.xml | 4 ++-- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 connectors/target-platform/e42-m2e140.target diff --git a/connectors/pom.xml b/connectors/pom.xml index 01b1424..7d2062f 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -59,6 +59,11 @@ p2 http://download.eclipse.org/releases/helios + + juno + p2 + http://download.eclipse.org/releases/juno + @@ -78,7 +83,7 @@ org.objectledge.maven.connectors target-platform 1.4.0-SNAPSHOT - e36-m2e110 + e43-m2e140 @@ -148,4 +153,4 @@ - \ No newline at end of file + diff --git a/connectors/target-platform/e42-m2e140.target b/connectors/target-platform/e42-m2e140.target new file mode 100644 index 0000000..aeae29c --- /dev/null +++ b/connectors/target-platform/e42-m2e140.target @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/connectors/target-platform/pom.xml b/connectors/target-platform/pom.xml index 4f53969..2760c76 100644 --- a/connectors/target-platform/pom.xml +++ b/connectors/target-platform/pom.xml @@ -45,9 +45,9 @@ - e36-m2e130.target + e42-m2e140.target target - e36-m2e130 + e42-m2e140 From 1e9ee978cfe45286200fbe1f9993f829320c93d5 Mon Sep 17 00:00:00 2001 From: Jisakiel Date: Thu, 8 Aug 2013 09:19:32 +0200 Subject: [PATCH 4/4] typo --- connectors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/pom.xml b/connectors/pom.xml index 7d2062f..0a07e2d 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -83,7 +83,7 @@ org.objectledge.maven.connectors target-platform 1.4.0-SNAPSHOT - e43-m2e140 + e42-m2e140