JBoss Tools SVN: r34183 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-23 17:26:16 -0400 (Tue, 23 Aug 2011)
New Revision: 34183
Modified:
trunk/build/aggregate/site/site.xml
Log:
JBIDE-9549 depend on http://download.jboss.org/jbosstools/updates/requirements/egit/1.1.0.2011... to resolve dep on eGit 1.1
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-08-23 21:26:01 UTC (rev 34182)
+++ trunk/build/aggregate/site/site.xml 2011-08-23 21:26:16 UTC (rev 34183)
@@ -45,6 +45,10 @@
<category name="AllTools" />
<category name="WebTools" />
</feature>
+ <feature url="features/org.jboss.ide.eclipse.as.server.egit.integration.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.server.egit.integration.feature" version="0.0.0">
+ <category name="AllTools" />
+ <category name="WebTools" />
+ </feature>
<feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0">
<category name="AllTools" />
<category name="GeneralTools" />
14 years, 7 months
JBoss Tools SVN: r34182 - trunk/as.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-23 17:26:01 -0400 (Tue, 23 Aug 2011)
New Revision: 34182
Modified:
trunk/as/pom.xml
Log:
JBIDE-9549 depend on http://download.jboss.org/jbosstools/updates/requirements/egit/1.1.0.2011... to resolve dep on eGit 1.1
Modified: trunk/as/pom.xml
===================================================================
--- trunk/as/pom.xml 2011-08-23 21:25:47 UTC (rev 34181)
+++ trunk/as/pom.xml 2011-08-23 21:26:01 UTC (rev 34182)
@@ -16,7 +16,16 @@
<module>plugins</module>
<module>tests</module>
<module>features</module>
- <module>site</module>
- </modules>
+ <module>site</module>
+ </modules>
+ <repositories>
+ <repository>
+ <id>egit11</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/egit/1.1.0.2011...</url>
+ <layout>p2</layout>
+ <snapshots><enabled>true</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </repository>
+ </repositories>
</project>
14 years, 7 months
JBoss Tools SVN: r34181 - in trunk/as: plugins and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-23 17:25:47 -0400 (Tue, 23 Aug 2011)
New Revision: 34181
Modified:
trunk/as/features/pom.xml
trunk/as/plugins/pom.xml
trunk/as/site/site.xml
Log:
JBIDE-9549 depend on http://download.jboss.org/jbosstools/updates/requirements/egit/1.1.0.2011... to resolve dep on eGit 1.1
Modified: trunk/as/features/pom.xml
===================================================================
--- trunk/as/features/pom.xml 2011-08-23 21:25:31 UTC (rev 34180)
+++ trunk/as/features/pom.xml 2011-08-23 21:25:47 UTC (rev 34181)
@@ -17,7 +17,7 @@
<module>org.jboss.ide.eclipse.as.server.rse.integration.feature</module>
<module>org.jboss.ide.eclipse.as.feature</module>
<module>org.jboss.ide.eclipse.as.test.feature</module>
- <!-- <module>org.jboss.ide.eclipse.as.server.egit.integration.feature</module> -->
+ <module>org.jboss.ide.eclipse.as.server.egit.integration.feature</module>
</modules>
</project>
Modified: trunk/as/plugins/pom.xml
===================================================================
--- trunk/as/plugins/pom.xml 2011-08-23 21:25:31 UTC (rev 34180)
+++ trunk/as/plugins/pom.xml 2011-08-23 21:25:47 UTC (rev 34181)
@@ -24,8 +24,8 @@
<module>org.jboss.ide.eclipse.as.rse.ui</module>
<module>org.jboss.ide.eclipse.as.jmx.integration</module>
<module>org.jboss.ide.eclipse.as.management.as7</module>
- <!-- <module>org.jboss.ide.eclipse.as.egit.core</module>
- <module>org.jboss.ide.eclipse.as.egit.ui</module> -->
+ <module>org.jboss.ide.eclipse.as.egit.core</module>
+ <module>org.jboss.ide.eclipse.as.egit.ui</module>
</modules>
</project>
Modified: trunk/as/site/site.xml
===================================================================
--- trunk/as/site/site.xml 2011-08-23 21:25:31 UTC (rev 34180)
+++ trunk/as/site/site.xml 2011-08-23 21:25:47 UTC (rev 34181)
@@ -8,6 +8,9 @@
<feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
<category name="JBoss Tools as Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.ide.eclipse.as.server.egit.integration.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.server.egit.integration.feature" version="0.0.0">
+ <category name="JBoss Tools as Nightly Build Update Site"/>
+ </feature>
<feature url="features/org.jboss.ide.eclipse.as.test.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.test.feature" version="0.0.0">
<category name="JBoss Tools as Nightly Build Update Site"/>
</feature>
14 years, 7 months
JBoss Tools SVN: r34180 - trunk/as/features/org.jboss.ide.eclipse.as.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-23 17:25:31 -0400 (Tue, 23 Aug 2011)
New Revision: 34180
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
Log:
JBIDE-9549: org.jboss.ide.eclipse.as.server.egit.integration.feature is NOT included here because it would cause eGit to become a Core dependency
Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2011-08-23 21:25:20 UTC (rev 34179)
+++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2011-08-23 21:25:31 UTC (rev 34180)
@@ -24,34 +24,6 @@
Raleigh NC 27606 USA.
</license>
- <includes
- id="org.jboss.ide.eclipse.archives.feature"
- version="0.0.0"/>
-
- <includes
- id="org.jboss.ide.eclipse.as.archives.integration"
- version="0.0.0"/>
-
- <includes
- id="org.jboss.ide.eclipse.as.jmx.integration"
- version="0.0.0"/>
-
- <includes
- id="org.jboss.ide.eclipse.as.server.rse.integration"
- version="0.0.0"/>
-
- <includes
- id="org.jboss.ide.eclipse.as.serverAdapter.wtp"
- version="0.0.0"/>
-
- <includes
- id="org.jboss.tools.jmx.feature"
- version="0.0.0"/>
-
- <includes
- id="org.jboss.ide.eclipse.archives.feature"
- version="0.0.0"/>
-
<requires>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.debug.core"/>
@@ -116,4 +88,34 @@
version="0.0.0"
unpack="false"/>
+ <includes
+ id="org.jboss.ide.eclipse.archives.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.ide.eclipse.as.archives.integration"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.ide.eclipse.as.jmx.integration"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.ide.eclipse.as.server.rse.integration"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.ide.eclipse.as.serverAdapter.wtp"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.jmx.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.ide.eclipse.archives.feature"
+ version="0.0.0"/>
+
+ <!-- JBIDE-9549: org.jboss.ide.eclipse.as.server.egit.integration.feature is NOT included here because it would cause eGit to become a Core dependency in JBDS instead of an Extra; therefore keep the egit feature SEPARATE for now -->
+
</feature>
14 years, 7 months
JBoss Tools SVN: r34179 - trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-23 17:25:20 -0400 (Tue, 23 Aug 2011)
New Revision: 34179
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature/pom.xml
Log:
set correct version for org.jboss.ide.eclipse.as.server.egit.integration.feature - must match feature.xml
Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature/pom.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature/pom.xml 2011-08-23 21:25:07 UTC (rev 34178)
+++ trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature/pom.xml 2011-08-23 21:25:20 UTC (rev 34179)
@@ -8,5 +8,6 @@
</parent>
<groupId>org.jboss.tools.as.features</groupId>
<artifactId>org.jboss.ide.eclipse.as.server.egit.integration.feature</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
14 years, 7 months
JBoss Tools SVN: r34178 - in trunk/as/plugins: org.jboss.ide.eclipse.as.egit.ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-23 17:25:07 -0400 (Tue, 23 Aug 2011)
New Revision: 34178
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/pom.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/pom.xml
Log:
fix suffix on new as.egit plugins
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/pom.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/pom.xml 2011-08-23 19:55:51 UTC (rev 34177)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/pom.xml 2011-08-23 21:25:07 UTC (rev 34178)
@@ -9,5 +9,5 @@
<groupId>org.jboss.tools.as.plugins</groupId>
<artifactId>org.jboss.ide.eclipse.as.egit.core</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>0.0.1</version>
+ <version>0.0.1-SNAPSHOT</version>
</project>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/pom.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/pom.xml 2011-08-23 19:55:51 UTC (rev 34177)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/pom.xml 2011-08-23 21:25:07 UTC (rev 34178)
@@ -9,5 +9,5 @@
<groupId>org.jboss.tools.as.plugins</groupId>
<artifactId>org.jboss.ide.eclipse.as.egit.ui</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>0.0.1</version>
+ <version>0.0.1-SNAPSHOT</version>
</project>
14 years, 7 months
JBoss Tools SVN: r34177 - in trunk/common: tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-23 15:55:51 -0400 (Tue, 23 Aug 2011)
New Revision: 34177
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/plugin.xml
trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-9120
Modified: trunk/common/plugins/org.jboss.tools.common.validation/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/plugin.xml 2011-08-23 18:47:40 UTC (rev 34176)
+++ trunk/common/plugins/org.jboss.tools.common.validation/plugin.xml 2011-08-23 19:55:51 UTC (rev 34177)
@@ -15,6 +15,9 @@
nameFilter="*.java"/>
<filter
objectClass="org.eclipse.core.resources.IFile"
+ nameFilter="*.project"/>
+ <filter
+ objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.xml"/>
<filter
objectClass="org.eclipse.core.resources.IFile"
Modified: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java 2011-08-23 18:47:40 UTC (rev 34176)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java 2011-08-23 19:55:51 UTC (rev 34177)
@@ -58,7 +58,7 @@
}
private void validate() {
- throw new RuntimeException("Test excpetion");
+ throw new RuntimeException("Test exception");
}
@Override
@@ -78,7 +78,7 @@
@Override
public boolean shouldValidate(IProject project) {
- return true;
+ return "JavaProject".equals(project.getName());
}
@Override
14 years, 7 months
JBoss Tools SVN: r34176 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-23 14:47:40 -0400 (Tue, 23 Aug 2011)
New Revision: 34176
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add dep plugins to TP for egit/jgit (JBIDE-9549)
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-08-23 17:45:45 UTC (rev 34175)
+++ trunk/build/target-platform/multiple.target 2011-08-23 18:47:40 UTC (rev 34176)
@@ -221,11 +221,13 @@
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/>
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/> -->
- <!-- JBIDE-9549 add egit/jgit to TP -->
- <unit id="org.eclipse.egit.feature.group" version="1.0.0"/>
- <unit id="org.eclipse.jgit.feature.group" version="1.0.0"/>
+ <!-- JBIDE-9549 add egit/jgit to TP, including dependent plugins -->
+ <unit id="org.eclipse.jsch.ui" version="1.1.300.I20110511-0800"/>
+ <unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
+ <unit id="com.jcraft.jsch" version="0.1.41.v201101211617"/>
+ <unit id="org.eclipse.jgit.feature.group" version="1.0.0.201106090707-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="1.0.0.201106090707-r"/>
</location>
-
</locations>
<includeBundles>
<feature id="org.drools.eclipse.feature"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-08-23 17:45:45 UTC (rev 34175)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-08-23 18:47:40 UTC (rev 34176)
@@ -199,8 +199,11 @@
<iu id="org.eclipse.wst.web_core.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.ws_ui.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/>
+<iu id="org.eclipse.jsch.ui" version=""/>
+<iu id="org.eclipse.jsch.core" version=""/>
+<iu id="com.jcraft.jsch" version=""/>
+<iu id="org.eclipse.jgit.feature.group" version=""/>
<iu id="org.eclipse.egit.feature.group" version=""/>
-<iu id="org.eclipse.jgit.feature.group" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-08-23 17:45:45 UTC (rev 34175)
+++ trunk/build/target-platform/unified.target 2011-08-23 18:47:40 UTC (rev 34176)
@@ -221,11 +221,13 @@
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/>
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/> -->
- <!-- JBIDE-9549 add egit/jgit to TP -->
- <unit id="org.eclipse.egit.feature.group" version="1.0.0"/>
- <unit id="org.eclipse.jgit.feature.group" version="1.0.0"/>
+ <!-- JBIDE-9549 add egit/jgit to TP, including dependent plugins -->
+ <unit id="org.eclipse.jsch.ui" version="1.1.300.I20110511-0800"/>
+ <unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
+ <unit id="com.jcraft.jsch" version="0.1.41.v201101211617"/>
+ <unit id="org.eclipse.jgit.feature.group" version="1.0.0.201106090707-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="1.0.0.201106090707-r"/>
</location>
-
</locations>
<includeBundles>
<feature id="org.drools.eclipse.feature"/>
@@ -235,4 +237,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-08-23 17:45:45 UTC (rev 34175)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-08-23 18:47:40 UTC (rev 34176)
@@ -199,8 +199,11 @@
<iu id="org.eclipse.wst.web_core.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.ws_ui.feature.feature.group" version=""/>
<iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/>
+<iu id="org.eclipse.jsch.ui" version=""/>
+<iu id="org.eclipse.jsch.core" version=""/>
+<iu id="com.jcraft.jsch" version=""/>
+<iu id="org.eclipse.jgit.feature.group" version=""/>
<iu id="org.eclipse.egit.feature.group" version=""/>
-<iu id="org.eclipse.jgit.feature.group" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
14 years, 7 months