Juan Hernandez has uploaded a new change for review.

Change subject: codegen: Simplify POM
......................................................................

codegen: Simplify POM

The POM for the code generator contains many things that were needed in
the past but aren't needed now. This patch removes them.

Change-Id: I9ba067ad5c62c8609ac3199fa687848e480a1d0c
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M ovirt-engine-sdk-java-codegen/pom.xml
1 file changed, 76 insertions(+), 141 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java 
refs/changes/46/22946/1

diff --git a/ovirt-engine-sdk-java-codegen/pom.xml 
b/ovirt-engine-sdk-java-codegen/pom.xml
index 73d274a..10b93d6 100644
--- a/ovirt-engine-sdk-java-codegen/pom.xml
+++ b/ovirt-engine-sdk-java-codegen/pom.xml
@@ -1,142 +1,77 @@
-<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>
-       <groupId>org.ovirt.engine.sdk</groupId>
-       <artifactId>ovirt-engine-sdk-java-codegen</artifactId>
-       <packaging>jar</packaging>
-       <version>1.0.0.1-SNAPSHOT</version>
-       <name>ovirt-engine-sdk-java-codegen</name>
-       <description>This is Java SDK codegen for oVirt 
virtualization</description>
-       <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <!-- dependency versions -->
-               <commons-logging.version>1.1</commons-logging.version>
-               <junit.version>4.8.1</junit.version>
-               <findbugs.version>2.5.1</findbugs.version>
-               <test-jar.plugin.version>2.2</test-jar.plugin.version>
-               <javassist.version>3.12.0.GA</javassist.version>
-               <log4j.version>1.2.16</log4j.version>
-               
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
-       </properties>
-       <dependencies>
-        <dependency>
-            <groupId>org.ovirt.engine.sdk</groupId>
-            <artifactId>ovirt-engine-sdk-java</artifactId>
-            <version>1.0.0.18-1</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.8.3</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-embedder</artifactId>
-          <version>3.0.5</version>
-        </dependency>
-        <dependency>
-          <groupId>org.sonatype.aether</groupId>
-          <artifactId>aether-connector-wagon</artifactId>
-          <version>1.13.1</version>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.maven.wagon</groupId>
-          <artifactId>wagon-http</artifactId>
-          <version>2.1</version>
-        </dependency>
-       </dependencies>
-       <url>http://www.ovirt.org/Java-sdk</url>
-       <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       
<artifactId>maven-compiler-plugin</artifactId>
-                                       
<version>${maven-compiler-plugin.version}</version>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                               <includes>
-                                                       
<include>**/*.txt</include>
-                                                       
<include>**/*.java</include>
-                                                       
<include>**/*.properties</include>
-                                               </includes>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       
<artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.2</version>
-                               </plugin>
-                               <plugin>
-                                       
<artifactId>maven-eclipse-plugin</artifactId>
-                                       <configuration>
-                                               
<useProjectReferences>true</useProjectReferences>
-                                       </configuration>
-                               </plugin>
-                               <!--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-checkstyle-plugin</artifactId>
-                                                                               
<versionRange>[2.6,)</versionRange>
-                                                                               
<goals>
-                                                                               
        <goal>check</goal>
-                                                                               
</goals>
-                                                                       
</pluginExecutionFilter>
-                                                                       <action>
-                                                                               
<ignore />
-                                                                       
</action>
-                                                               
</pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       
<groupId>org.apache.maven.plugins</groupId>
-                                       
<artifactId>maven-jar-plugin</artifactId>
-                                       
<version>${test-jar.plugin.version}</version>
-                                       <executions>
-                                               <execution>
-                                                       <goals>
-                                                               
<goal>test-jar</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-               <resources>
-                       <resource>
-                               <directory>src/main/java</directory>
-                               <excludes>
-                                       <exclude>**/*.java</exclude>
-                               </excludes>
-                       </resource>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-               </resources>
-       </build>
-    <licenses>
-      <license>
-        <name>The Apache Software License, Version 2.0</name>
-        <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        <distribution>repo</distribution>
-      </license>
-    </licenses>  
+<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>
+
+  <groupId>org.ovirt.engine.sdk</groupId>
+  <artifactId>ovirt-engine-sdk-java-codegen</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0.0.1-SNAPSHOT</version>
+
+  <name>ovirt-engine-sdk-java-codegen</name>
+  <description>This is Java SDK codegen for oVirt virtualization</description>
+  <url>http://www.ovirt.org/Java-sdk</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.ovirt.engine.sdk</groupId>
+      <artifactId>ovirt-engine-sdk-java</artifactId>
+      <version>1.0.0.18-1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-embedder</artifactId>
+      <version>3.0.5</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+
+    <resources>
+
+      <!-- This is needed because the templates used by the code generator
+           are in the same directory than the Java source, and they aren't
+           included in the resulting jar file by default: -->
+      <resource>
+        <directory>src/main/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+
+    </resources>
+
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+
+    </plugins>
+
+  </build>
+
 </project>


-- 
To view, visit http://gerrit.ovirt.org/22946
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ba067ad5c62c8609ac3199fa687848e480a1d0c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk-java
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to