Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'integration/master' of github.com:zanata/zanata-common …

…into integration/master

Conflicts:
	.gitignore
  • Loading branch information...
commit da1114bdbdbffa9c4c54abc44834d56f31b790b4 2 parents e6d9624 + 6078199
@carlosmunoz carlosmunoz authored
View
8 .gitignore
@@ -1,4 +1,6 @@
-target/**
-**/target/**
+/target/
+/*/target/
+*~
+/.settings
+/.project
*.iml
-**/*.class
View
6 pom.xml
@@ -11,9 +11,9 @@
</parent>
<scm>
- <connection>scm:git:git://github.com/zanata/zanata.git</connection>
- <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
- <url>https://github.com/zanata/zanata</url>
+ <connection>scm:git:git://github.com/zanata/zanata-common.git</connection>
+ <developerConnection>scm:git:git@github.com:zanata/zanata-common.git</developerConnection>
+ <url>https://github.com/zanata/zanata-common</url>
</scm>
<modules>
View
3  zanata-adapter-po/.gitignore
@@ -0,0 +1,3 @@
+/.settings
+/.classpath
+/.project
View
9 zanata-adapter-po/pom.xml
@@ -7,15 +7,14 @@
<groupId>org.zanata</groupId>
<artifactId>zanata-parent</artifactId>
<version>1.6.0-alpha-2-SNAPSHOT</version>
-
</parent>
<packaging>jar</packaging>
- <!-- Should be the same as zanata-parent/pom.xml -->
+ <!-- Should be the same as zanata-common/pom.xml -->
<scm>
- <connection>scm:git:git://github.com/zanata/zanata.git</connection>
- <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
- <url>https://github.com/zanata/zanata</url>
+ <connection>scm:git:git://github.com/zanata/zanata-common.git</connection>
+ <developerConnection>scm:git:git@github.com:zanata/zanata-common.git</developerConnection>
+ <url>https://github.com/zanata/zanata-common</url>
</scm>
<dependencies>
View
3  zanata-adapter-properties/.gitignore
@@ -0,0 +1,3 @@
+/.settings
+/.classpath
+/.project
View
13 zanata-adapter-properties/pom.xml
@@ -7,16 +7,15 @@
<groupId>org.zanata</groupId>
<artifactId>zanata-parent</artifactId>
<version>1.6.0-alpha-2-SNAPSHOT</version>
-
</parent>
<packaging>jar</packaging>
- <!-- Should be the same as zanata-parent/pom.xml -->
- <scm>
- <connection>scm:git:git://github.com/zanata/zanata.git</connection>
- <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
- <url>https://github.com/zanata/zanata</url>
- </scm>
+ <!-- Should be the same as zanata-common/pom.xml -->
+ <scm>
+ <connection>scm:git:git://github.com/zanata/zanata-common.git</connection>
+ <developerConnection>scm:git:git@github.com:zanata/zanata-common.git</developerConnection>
+ <url>https://github.com/zanata/zanata-common</url>
+ </scm>
<dependencies>
<dependency>
View
3  zanata-adapter-xliff/.gitignore
@@ -0,0 +1,3 @@
+/.classpath
+/.project
+/.settings
View
13 zanata-adapter-xliff/pom.xml
@@ -7,16 +7,15 @@
<groupId>org.zanata</groupId>
<artifactId>zanata-parent</artifactId>
<version>1.6.0-alpha-2-SNAPSHOT</version>
-
</parent>
<packaging>jar</packaging>
- <!-- Should be the same as zanata-parent/pom.xml -->
- <scm>
- <connection>scm:git:git://github.com/zanata/zanata.git</connection>
- <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
- <url>https://github.com/zanata/zanata</url>
- </scm>
+ <!-- Should be the same as zanata-common/pom.xml -->
+ <scm>
+ <connection>scm:git:git://github.com/zanata/zanata-common.git</connection>
+ <developerConnection>scm:git:git@github.com:zanata/zanata-common.git</developerConnection>
+ <url>https://github.com/zanata/zanata-common</url>
+ </scm>
<dependencies>
<dependency>
View
3  zanata-common-util/.gitignore
@@ -0,0 +1,3 @@
+/.classpath
+/.project
+/.settings
View
13 zanata-common-util/pom.xml
@@ -7,16 +7,15 @@
<artifactId>zanata-parent</artifactId>
<groupId>org.zanata</groupId>
<version>1.6.0-alpha-2-SNAPSHOT</version>
-
</parent>
<packaging>jar</packaging>
- <!-- Should be the same as zanata-parent/pom.xml -->
- <scm>
- <connection>scm:git:git://github.com/zanata/zanata.git</connection>
- <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
- <url>https://github.com/zanata/zanata</url>
- </scm>
+ <!-- Should be the same as zanata-common/pom.xml -->
+ <scm>
+ <connection>scm:git:git://github.com/zanata/zanata-common.git</connection>
+ <developerConnection>scm:git:git@github.com:zanata/zanata-common.git</developerConnection>
+ <url>https://github.com/zanata/zanata-common</url>
+ </scm>
<build>
<resources>
Please sign in to comment.
Something went wrong with that request. Please try again.