Skip to content

Commit

Permalink
making non-deployable projects jar type
Browse files Browse the repository at this point in the history
  • Loading branch information
eugenp committed Aug 6, 2014
1 parent add6036 commit c1de3ea
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 105 deletions.
1 change: 0 additions & 1 deletion spring-hibernate3/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
26 changes: 7 additions & 19 deletions spring-hibernate3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,25 @@
<version>0.1-SNAPSHOT</version>

<name>spring-hibernate3</name>
<packaging>war</packaging>

<dependencies>

<!-- Spring -->

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version>
</dependency>

<!-- persistence -->

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version>
</dependency>

<!-- persistence -->


<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
Expand All @@ -46,13 +41,13 @@
<version>${mysql-connector-java.version}</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
<version>${tomcat-dbcp.version}</version>
</dependency>

<!-- utils -->

<dependency>
Expand Down Expand Up @@ -127,12 +122,6 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -206,7 +195,6 @@

<!-- maven plugins -->
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
Expand Down
1 change: 0 additions & 1 deletion spring-hibernate4/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
16 changes: 1 addition & 15 deletions spring-hibernate4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,13 @@
<groupId>org.baeldung</groupId>
<artifactId>spring-hibernate4</artifactId>
<version>0.1-SNAPSHOT</version>

<name>spring-hibernate4</name>
<packaging>war</packaging>

<dependencies>

<!-- Spring -->

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Expand Down Expand Up @@ -135,12 +129,6 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -212,10 +200,8 @@

<rest-assured.version>2.3.1</rest-assured.version>


<!-- maven plugins -->
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
Expand Down
18 changes: 0 additions & 18 deletions spring-hibernate4/src/main/webapp/WEB-INF/web.xml

This file was deleted.

1 change: 0 additions & 1 deletion spring-jpa/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
Expand Down
5 changes: 3 additions & 2 deletions spring-jpa/.springBeans
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[3.2.0.201303060654-RELEASE]]></pluginVersion>
<pluginVersion><![CDATA[3.6.0.201407080615-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/main/webapp/WEB-INF/mvc-servlet.xml</config>
</configs>
<autoconfigs>
</autoconfigs>
<configSets>
</configSets>
</beansProjectDescription>
15 changes: 1 addition & 14 deletions spring-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,12 @@
<artifactId>spring-jpa</artifactId>
<version>0.1-SNAPSHOT</version>

<packaging>war</packaging>
<name>spring-jpa</name>

<dependencies>

<!-- Spring -->

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
Expand Down Expand Up @@ -130,12 +124,6 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -205,13 +193,12 @@

<rest-assured.version>2.3.1</rest-assured.version>


<!-- maven plugins -->
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
<!-- <maven-war-plugin.version>2.4</maven-war-plugin.version> -->

</properties>

Expand Down
6 changes: 0 additions & 6 deletions spring-jpa/src/main/webapp/WEB-INF/mvc-servlet.xml

This file was deleted.

7 changes: 0 additions & 7 deletions spring-jpa/src/main/webapp/WEB-INF/view/sample.jsp

This file was deleted.

21 changes: 0 additions & 21 deletions spring-jpa/src/main/webapp/WEB-INF/web.xml

This file was deleted.

0 comments on commit c1de3ea

Please sign in to comment.