Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TEIIDDES-2587 Re-enable Modeshape maven build logic for latest community release #498

Merged
merged 1 commit into from Sep 8, 2015
Merged

TEIIDDES-2587 Re-enable Modeshape maven build logic for latest community release #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/org.teiid.designer.modeshape/.externalToolBuilders/mvn-generate.launch
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.teiid.designer.modeshape"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/.classpath&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/.externalToolBuilders&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/.project&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/COPYRIGHT.txt&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/META-INF&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/build.properties&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/build.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/plugin.properties&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.teiid.designer.modeshape/pom.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.teiid.designer.modeshape/build.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,clean"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.teiid.designer.modeshape}"/>
</launchConfiguration>
1 change: 0 additions & 1 deletion plugins/org.teiid.designer.modeshape/.project
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
Expand Down
4 changes: 1 addition & 3 deletions plugins/org.teiid.designer.modeshape/build.xml
View file
Open in desktop
Expand Up @@ -57,9 +57,7 @@
<echo message="Project source generation is up-to-date" />
</target>

<!-- Disabled since the jars have been included in the codebase -->
<!--target name="generate" depends="check-work, nothing-todo" if="should-generate"-->
<target name="generate" depends="init-ant-contrib, nothing-todo" if="should-generate">
<target name="generate" depends="init-ant-contrib, check-work, nothing-todo" if="should-generate">
<echo message="Generating from maven ..." />

<!-- Build the target platform and install it -->
Expand Down
6 changes: 3 additions & 3 deletions plugins/org.teiid.designer.modeshape/lib/lib-versions.txt
View file
Open in desktop
@@ -1,5 +1,5 @@
modeshape-common-3.8.3.GA-redhat-5
modeshape-sequencer-ddl-3.8.3.GA-redhat-5
modeshape-common-4.4.0.Final
modeshape-sequencer-ddl-4.4.0.Final

built from branch 3.8.x-prod-ip6.2
built from branch master

Binary file modified plugins/org.teiid.designer.modeshape/lib/modeshape-common.jar
View file
Open in desktop
Binary file not shown.
Binary file modified plugins/org.teiid.designer.modeshape/lib/modeshape-sequencer-ddl.jar
View file
Open in desktop
Binary file not shown.
Binary file modified plugins/org.teiid.designer.modeshape/libsrc/modeshape-common-sources.jar
View file
Open in desktop
Binary file not shown.
Binary file modified plugins/org.teiid.designer.modeshape/libsrc/modeshape-sequencer-ddl-sources.jar
View file
Open in desktop
Binary file not shown.
246 changes: 122 additions & 124 deletions plugins/org.teiid.designer.modeshape/pom.xml
View file
Open in desktop
Expand Up @@ -10,101 +10,99 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>org.teiid.designer.modeshape</artifactId>
<version>9.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<!-- <properties> -->
<!-- <version.org.modeshape.common>3.3.0.Final</version.org.modeshape.common> -->
<!-- <version.org.modeshape.sequencer.ddl>3.3.0.Final</version.org.modeshape.sequencer.ddl> -->
<!-- </properties> -->
<!-- <profiles> -->
<!-- <profile> -->
<!-- -->
<!-- Profile that must be manually invoked to download and copy in -->
<!-- the source jars. Don't want the source in the build hence not -->
<!-- enabled by default. -->
<!-- -->
<!-- <id>download-sources</id> -->
<!-- <build> -->
<!-- <plugins> -->
<!-- <plugin> -->
<!-- <groupId>org.apache.maven.plugins</groupId> -->
<!-- <artifactId>maven-dependency-plugin</artifactId> -->
<!-- <executions> -->
<!-- <execution> -->
<!-- <id>copy-dependencies-src</id> -->
<!-- <goals> -->
<!-- <goal>copy</goal> -->
<!-- </goals> -->
<!-- <configuration> -->
<!-- <artifactItems> -->
<!-- <artifactItem> -->
<!-- <groupId>org.modeshape</groupId> -->
<!-- <artifactId>modeshape-common</artifactId> -->
<!-- <version>${version.org.modeshape.common}</version> -->
<!-- <classifier>sources</classifier> -->
<!-- </artifactItem> -->
<!-- <artifactItem> -->
<!-- <groupId>org.modeshape</groupId> -->
<!-- <artifactId>modeshape-sequencer-ddl</artifactId> -->
<!-- <version>${version.org.modeshape.sequencer.ddl}</version> -->
<!-- <classifier>sources</classifier> -->
<!-- </artifactItem> -->
<!-- </artifactItems> -->
<!-- <skip>false</skip> -->
<!-- <stripVersion>true</stripVersion> -->
<!-- <outputDirectory>${project.basedir}/libsrc</outputDirectory> -->
<!-- </configuration> -->
<!-- </execution> -->
<!-- </executions> -->
<!-- </plugin> -->
<!-- </plugins> -->
<!-- </build> -->
<!-- </profile> -->
<!-- </profiles> -->
<properties>
<version.org.modeshape.common>4.4.0.Final</version.org.modeshape.common>
<version.org.modeshape.sequencer.ddl>4.4.0.Final</version.org.modeshape.sequencer.ddl>
</properties>
<profiles>
<profile>
<!-- Profile that must be manually invoked to download and copy in -->
<!-- the source jars. Don't want the source in the build hence not -->
<!-- enabled by default. -->
<id>download-sources</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies-src</id>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-common</artifactId>
<version>${version.org.modeshape.common}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-ddl</artifactId>
<version>${version.org.modeshape.sequencer.ddl}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<skip>false</skip>
<stripVersion>true</stripVersion>
<outputDirectory>${project.basedir}/libsrc</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
<plugins>
<!-- <plugin> -->
<!-- <artifactId>maven-clean-plugin</artifactId> -->
<!-- <version>2.5</version> -->
<!-- <configuration> -->
<!-- <filesets> -->
<!-- <fileset> -->
<!-- <directory>.</directory> -->
<!-- <includes> -->
<!-- <include>**/lib/*.jar</include> -->
<!-- <include>**/libsrc/*.jar</include> -->
<!-- </includes> -->
<!-- </fileset> -->
<!-- </filesets> -->
<!-- </configuration> -->
<!-- </plugin> -->
<!-- <plugin> -->
<!-- <groupId>org.apache.maven.plugins</groupId> -->
<!-- <artifactId>maven-dependency-plugin</artifactId> -->
<!-- <executions> -->
<!-- <execution> -->
<!-- <id>copy-dependencies</id> -->
<!-- <goals> -->
<!-- <goal>copy</goal> -->
<!-- </goals> -->
<!-- <configuration> -->
<!-- <artifactItems> -->
<!-- <artifactItem> -->
<!-- <groupId>org.modeshape</groupId> -->
<!-- <artifactId>modeshape-common</artifactId> -->
<!-- <version>${version.org.modeshape.common}</version> -->
<!-- </artifactItem> -->
<!-- <artifactItem> -->
<!-- <groupId>org.modeshape</groupId> -->
<!-- <artifactId>modeshape-sequencer-ddl</artifactId> -->
<!-- <version>${version.org.modeshape.sequencer.ddl}</version> -->
<!-- </artifactItem> -->
<!-- </artifactItems> -->
<!-- <skip>false</skip> -->
<!-- <stripVersion>true</stripVersion> -->
<!-- <outputDirectory>${project.basedir}/lib</outputDirectory> -->
<!-- </configuration> -->
<!-- </execution> -->
<!-- </executions> -->
<!-- </plugin> -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<configuration>
<filesets>
<fileset>
<directory>.</directory>
<includes>
<include>**/lib/*.jar</include>
<include>**/libsrc/*.jar</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-common</artifactId>
<version>${version.org.modeshape.common}</version>
</artifactItem>
<artifactItem>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-ddl</artifactId>
<version>${version.org.modeshape.sequencer.ddl}</version>
</artifactItem>
</artifactItems>
<skip>false</skip>
<stripVersion>true</stripVersion>
<outputDirectory>${project.basedir}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
Expand Down Expand Up @@ -154,35 +152,35 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</plugins>
</pluginManagement>
</build>
<!-- <repositories> -->
<!-- <repository> -->
<!-- <id>jboss-public-repository</id> -->
<!-- <name>JBoss Public Maven Repository Group</name> -->
<!-- <url>http://repository.jboss.org/nexus/content/groups/public/</url> -->
<!-- </repository> -->
<!-- </repositories> -->
<!-- <dependencies> -->
<!-- <dependency> -->
<!-- <groupId>org.modeshape</groupId> -->
<!-- <artifactId>modeshape-common</artifactId> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.modeshape</groupId> -->
<!-- <artifactId>modeshape-sequencer-ddl</artifactId> -->
<!-- </dependency> -->
<!-- </dependencies> -->
<!-- <dependencyManagement> -->
<!-- <dependencies> -->
<!-- <dependency> -->
<!-- <groupId>org.modeshape</groupId> -->
<!-- <artifactId>modeshape-common</artifactId> -->
<!-- <version>${version.org.modeshape.common}</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.modeshape</groupId> -->
<!-- <artifactId>modeshape-sequencer-ddl</artifactId> -->
<!-- <version>${version.org.modeshape.sequencer.ddl}</version> -->
<!-- </dependency> -->
<!-- </dependencies> -->
<!-- </dependencyManagement> -->
<repositories>
<repository>
<id>jboss-public-repository</id>
<name>JBoss Public Maven Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-common</artifactId>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-ddl</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-common</artifactId>
<version>${version.org.modeshape.common}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-ddl</artifactId>
<version>${version.org.modeshape.sequencer.ddl}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>