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

IDEX-2982. Change Che pom.xml parent values #61

Merged
merged 1 commit into from
Oct 13, 2015
Merged

IDEX-2982. Change Che pom.xml parent values #61

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions assembly-sdk-war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>che-sdk-parent</artifactId>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>che-ide-parent</artifactId>
<groupId>org.eclipse.che.ide</groupId>
<version>3.13.1-SNAPSHOT</version>
</parent>
<artifactId>assembly-sdk-war</artifactId>
<packaging>war</packaging>
<name>Che SDK :: Compiling GWT Application</name>
<name>Che :: Compiling GWT Application</name>
<properties>
<generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
<maven.compiler.source>1.7</maven.compiler.source>
Expand Down
18 changes: 9 additions & 9 deletions assembly-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>che-sdk-parent</artifactId>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>che-ide-parent</artifactId>
<groupId>org.eclipse.che.ide</groupId>
<version>3.13.1-SNAPSHOT</version>
</parent>
<artifactId>assembly-sdk</artifactId>
<packaging>pom</packaging>
<name>Che SDK :: Assemblies Tomcat</name>
<name>Che :: Assemblies Tomcat</name>
<dependencies>
<dependency>
<groupId>com.codenvy.resources</groupId>
Expand Down Expand Up @@ -52,6 +52,12 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.che.ide</groupId>
<artifactId>assembly-sdk-war</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-docker-recipes</artifactId>
Expand All @@ -65,12 +71,6 @@
<type>jar</type>
<classifier>jar-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>assembly-sdk-war</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion assembly-sdk/src/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<outputDirectory>webapps</outputDirectory>
<outputFileNameMapping>che.war</outputFileNameMapping>
<includes>
<include>org.eclipse.che.sdk:assembly-sdk-war</include>
<include>org.eclipse.che.ide:assembly-sdk-war</include>
</includes>
</dependencySet>
<dependencySet>
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>che-sdk-parent</artifactId>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>che-ide-parent</artifactId>
<groupId>org.eclipse.che.ide</groupId>
<version>3.13.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.examples</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<groupId>org.eclipse.che.depmgt</groupId>
<version>3.13.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>che-sdk-parent</artifactId>
<groupId>org.eclipse.che.ide</groupId>
<artifactId>che-ide-parent</artifactId>
<version>3.13.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che SDK :: Parent</name>
<name>Che :: Parent</name>
<modules>
<module>examples</module>
<module>assembly-sdk-war</module>
Expand Down