JBoss Tools SVN: r42537 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-12 08:32:10 -0400 (Thu, 12 Jul 2012)
New Revision: 42537
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/pom.xml
trunk/build/target-platform/unified.target
Log:
JBIDE-11469 JBIDE-12316: WIP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 12:07:11 UTC (rev 42536)
+++ trunk/build/target-platform/multiple.target 2012-07-12 12:32:10 UTC (rev 42537)
@@ -256,7 +256,6 @@
<unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.6.v20120628"/>
- <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
Modified: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml 2012-07-12 12:07:11 UTC (rev 42536)
+++ trunk/build/target-platform/pom.xml 2012-07-12 12:32:10 UTC (rev 42537)
@@ -38,6 +38,7 @@
</goals>
<configuration>
<targetFiles>
+ <param>multiple.target</param>
<param>unified.target</param>
</targetFiles>
<failOnError>true</failOnError>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 12:07:11 UTC (rev 42536)
+++ trunk/build/target-platform/unified.target 2012-07-12 12:32:10 UTC (rev 42537)
@@ -256,7 +256,6 @@
<unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.6.v20120628"/>
- <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
13 years, 9 months
JBoss Tools SVN: r42536 - in trunk/build: target-platform and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-12 08:07:11 -0400 (Thu, 12 Jul 2012)
New Revision: 42536
Modified:
trunk/build/parent/pom.xml
trunk/build/target-platform/pom.xml
Log:
JBIDE-12003: Set up target-platform-validation-plugin on target-platform pom
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-07-12 10:36:24 UTC (rev 42535)
+++ trunk/build/parent/pom.xml 2012-07-12 12:07:11 UTC (rev 42536)
@@ -7,9 +7,6 @@
<version>3.4.0.M1-SNAPSHOT</version>
<name>JBoss Tools Parent</name>
<packaging>pom</packaging>
- <modules>
- <module>../target-platform</module>
- </modules>
<properties>
<!-- to build w/ latest 0.15.0-SNAPSHOT, run `mvn install -DtychoVersion=0.15.0-SNAPSHOT` -->
Modified: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml 2012-07-12 10:36:24 UTC (rev 42535)
+++ trunk/build/target-platform/pom.xml 2012-07-12 12:07:11 UTC (rev 42536)
@@ -18,11 +18,34 @@
<eclipse.version>4.2</eclipse.version>
<eclipse.type>platform</eclipse.type>
<eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl...</eclipse.URL>
+ <!-- Temporary before release of Tycho 0.16 -->
+ <!-- JBIDE-12003 -->
+ <tychoVersion>0.16.0-SNAPSHOT</tychoVersion>
+ <tychoExtrasVersion>0.16.0-SNAPSHOT</tychoExtrasVersion>
</properties>
<build>
<plugins>
<plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>target-platform-validation-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate-target-platform</goal>
+ </goals>
+ <configuration>
+ <targetFiles>
+ <param>unified.target</param>
+ </targetFiles>
+ <failOnError>true</failOnError>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.3</version>
@@ -198,5 +221,12 @@
<layout>default</layout>
</snapshotRepository>
</distributionManagement>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>tycho-snapshots</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </pluginRepository>
+</pluginRepositories>
</project>
13 years, 9 months
JBoss Tools SVN: r42535 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-12 06:36:24 -0400 (Thu, 12 Jul 2012)
New Revision: 42535
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
JBIDE-11469: WIP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 10:08:54 UTC (rev 42534)
+++ trunk/build/target-platform/multiple.target 2012-07-12 10:36:24 UTC (rev 42535)
@@ -260,6 +260,8 @@
<unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
+ <!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
+ <unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
<unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 10:08:54 UTC (rev 42534)
+++ trunk/build/target-platform/unified.target 2012-07-12 10:36:24 UTC (rev 42535)
@@ -260,6 +260,8 @@
<unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
+ <!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
+ <unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
<unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
13 years, 9 months
JBoss Tools SVN: r42534 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-12 06:08:54 -0400 (Thu, 12 Jul 2012)
New Revision: 42534
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
JBIDE-11469: WIP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 09:24:51 UTC (rev 42533)
+++ trunk/build/target-platform/multiple.target 2012-07-12 10:08:54 UTC (rev 42534)
@@ -287,6 +287,7 @@
<unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
<unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
<unit id="javax.ejb" version="3.1.1.v201204261316"/>
+ <unit id="javax.transaction" version="1.1.1.v201105210645"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 09:24:51 UTC (rev 42533)
+++ trunk/build/target-platform/unified.target 2012-07-12 10:08:54 UTC (rev 42534)
@@ -287,6 +287,7 @@
<unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
<unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
<unit id="javax.ejb" version="3.1.1.v201204261316"/>
+ <unit id="javax.transaction" version="1.1.1.v201105210645"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
13 years, 9 months
JBoss Tools SVN: r42533 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-12 05:24:51 -0400 (Thu, 12 Jul 2012)
New Revision: 42533
Modified:
trunk/build/target-platform/multiple.target
Log:
JBIDE-11469: WIP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 09:20:13 UTC (rev 42532)
+++ trunk/build/target-platform/multiple.target 2012-07-12 09:24:51 UTC (rev 42533)
@@ -261,7 +261,7 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
- <unit id="org.xmlpull" version="1.1.3.4_v2012015148"/>
+ <unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
<unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
<unit id="org.eclipse.core.resources" version="3.8.0.v20120522-2034"/>
@@ -286,6 +286,7 @@
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
<unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
+ <unit id="javax.ejb" version="3.1.1.v201204261316"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
13 years, 9 months
JBoss Tools SVN: r42532 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-12 05:20:13 -0400 (Thu, 12 Jul 2012)
New Revision: 42532
Modified:
trunk/build/target-platform/unified.target
Log:
JBIDE-11469: WIP
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 09:08:58 UTC (rev 42531)
+++ trunk/build/target-platform/unified.target 2012-07-12 09:20:13 UTC (rev 42532)
@@ -286,7 +286,7 @@
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
<unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
- <unit id="javax.ejb" version="3.0.0.v201203061215"/>
+ <unit id="javax.ejb" version="3.1.1.v201204261316"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
13 years, 9 months
JBoss Tools SVN: r42531 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-12 05:08:58 -0400 (Thu, 12 Jul 2012)
New Revision: 42531
Modified:
trunk/build/target-platform/unified.target
Log:
JBIDE-11469: WIP
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 07:19:28 UTC (rev 42530)
+++ trunk/build/target-platform/unified.target 2012-07-12 09:08:58 UTC (rev 42531)
@@ -261,7 +261,7 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
- <unit id="org.xmlpull" version="1.1.3.4_v2012015148"/>
+ <unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
<unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
<unit id="org.eclipse.core.resources" version="3.8.0.v20120522-2034"/>
@@ -286,6 +286,7 @@
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
<unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
+ <unit id="javax.ejb" version="3.0.0.v201203061215"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
13 years, 9 months
JBoss Tools SVN: r42530 - trunk/forge/tests/org.jboss.tools.forge.ui.test.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-07-12 03:19:28 -0400 (Thu, 12 Jul 2012)
New Revision: 42530
Modified:
trunk/forge/tests/org.jboss.tools.forge.ui.test/build.properties
Log:
cleanup
Modified: trunk/forge/tests/org.jboss.tools.forge.ui.test/build.properties
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.test/build.properties 2012-07-12 07:19:07 UTC (rev 42529)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.test/build.properties 2012-07-12 07:19:28 UTC (rev 42530)
@@ -1,4 +1,3 @@
source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
.
13 years, 9 months
JBoss Tools SVN: r42529 - in trunk/forge/tests/org.jboss.tools.forge.core.test: src/org/jboss/tools/forge/core/io and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-07-12 03:19:07 -0400 (Thu, 12 Jul 2012)
New Revision: 42529
Modified:
trunk/forge/tests/org.jboss.tools.forge.core.test/build.properties
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/io/ForgeInputStreamTest.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializerTest.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java
Log:
cleanup
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/build.properties
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/build.properties 2012-07-12 07:16:46 UTC (rev 42528)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/build.properties 2012-07-12 07:19:07 UTC (rev 42529)
@@ -1,4 +1,3 @@
source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
.
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/io/ForgeInputStreamTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/io/ForgeInputStreamTest.java 2012-07-12 07:16:46 UTC (rev 42528)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/io/ForgeInputStreamTest.java 2012-07-12 07:19:07 UTC (rev 42529)
@@ -1,7 +1,5 @@
package org.jboss.tools.forge.core.io;
-import static org.junit.Assert.*;
-
import org.junit.Test;
public class ForgeInputStreamTest {
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializerTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializerTest.java 2012-07-12 07:16:46 UTC (rev 42528)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializerTest.java 2012-07-12 07:19:07 UTC (rev 42529)
@@ -1,7 +1,6 @@
package org.jboss.tools.forge.core.preferences;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2012-07-12 07:16:46 UTC (rev 42528)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2012-07-12 07:19:07 UTC (rev 42529)
@@ -21,7 +21,6 @@
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.osgi.framework.Bundle;
public class ForgeAbstractRuntimeTest {
13 years, 9 months
JBoss Tools SVN: r42528 - trunk/forge/plugins/org.jboss.tools.forge.runtime.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-07-12 03:16:46 -0400 (Thu, 12 Jul 2012)
New Revision: 42528
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
Log:
ignore unpack goal when building with m2e
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2012-07-12 01:45:30 UTC (rev 42527)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2012-07-12 07:16:46 UTC (rev 42528)
@@ -38,6 +38,41 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--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>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-dependency-plugin
+ </artifactId>
+ <versionRange>
+ [2.4,)
+ </versionRange>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
13 years, 9 months