Skip to content

Commit c1de3ea

Browse files
author
eugenp
committed
making non-deployable projects jar type
1 parent add6036 commit c1de3ea

File tree

11 files changed

+12
-105
lines changed

11 files changed

+12
-105
lines changed

‎spring-hibernate3/.classpath‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3131
<attributes>
3232
<attribute name="maven.pomderived" value="true"/>
33-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3433
</attributes>
3534
</classpathentry>
3635
<classpathentry kind="output" path="target/classes"/>

‎spring-hibernate3/pom.xml‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,25 @@
66
<version>0.1-SNAPSHOT</version>
77

88
<name>spring-hibernate3</name>
9-
<packaging>war</packaging>
109

1110
<dependencies>
1211

1312
<!-- Spring -->
1413

1514
<dependency>
1615
<groupId>org.springframework</groupId>
17-
<artifactId>spring-web</artifactId>
16+
<artifactId>spring-context</artifactId>
1817
<version>${org.springframework.version}</version>
1918
</dependency>
19+
20+
<!-- persistence -->
21+
2022
<dependency>
2123
<groupId>org.springframework</groupId>
2224
<artifactId>spring-orm</artifactId>
2325
<version>${org.springframework.version}</version>
2426
</dependency>
25-
<dependency>
26-
<groupId>org.springframework</groupId>
27-
<artifactId>spring-context</artifactId>
28-
<version>${org.springframework.version}</version>
29-
</dependency>
30-
31-
<!-- persistence -->
32-
27+
3328
<dependency>
3429
<groupId>org.hibernate</groupId>
3530
<artifactId>hibernate-core</artifactId>
@@ -46,13 +41,13 @@
4641
<version>${mysql-connector-java.version}</version>
4742
<scope>runtime</scope>
4843
</dependency>
49-
44+
5045
<dependency>
5146
<groupId>org.apache.tomcat</groupId>
5247
<artifactId>tomcat-dbcp</artifactId>
5348
<version>${tomcat-dbcp.version}</version>
5449
</dependency>
55-
50+
5651
<!-- utils -->
5752

5853
<dependency>
@@ -127,12 +122,6 @@
127122
</configuration>
128123
</plugin>
129124

130-
<plugin>
131-
<groupId>org.apache.maven.plugins</groupId>
132-
<artifactId>maven-war-plugin</artifactId>
133-
<version>${maven-war-plugin.version}</version>
134-
</plugin>
135-
136125
<plugin>
137126
<groupId>org.apache.maven.plugins</groupId>
138127
<artifactId>maven-surefire-plugin</artifactId>
@@ -206,7 +195,6 @@
206195

207196
<!-- maven plugins -->
208197
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
209-
<maven-war-plugin.version>2.4</maven-war-plugin.version>
210198
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
211199
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
212200
<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>

‎spring-hibernate4/.classpath‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3131
<attributes>
3232
<attribute name="maven.pomderived" value="true"/>
33-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3433
</attributes>
3534
</classpathentry>
3635
<classpathentry kind="output" path="target/classes"/>

‎spring-hibernate4/pom.xml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@
44
<groupId>org.baeldung</groupId>
55
<artifactId>spring-hibernate4</artifactId>
66
<version>0.1-SNAPSHOT</version>
7-
7+
88
<name>spring-hibernate4</name>
9-
<packaging>war</packaging>
109

1110
<dependencies>
1211

1312
<!-- Spring -->
1413

15-
<dependency>
16-
<groupId>org.springframework</groupId>
17-
<artifactId>spring-web</artifactId>
18-
<version>${org.springframework.version}</version>
19-
</dependency>
2014
<dependency>
2115
<groupId>org.springframework</groupId>
2216
<artifactId>spring-context</artifactId>
@@ -135,12 +129,6 @@
135129
</configuration>
136130
</plugin>
137131

138-
<plugin>
139-
<groupId>org.apache.maven.plugins</groupId>
140-
<artifactId>maven-war-plugin</artifactId>
141-
<version>${maven-war-plugin.version}</version>
142-
</plugin>
143-
144132
<plugin>
145133
<groupId>org.apache.maven.plugins</groupId>
146134
<artifactId>maven-surefire-plugin</artifactId>
@@ -212,10 +200,8 @@
212200

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

215-
216203
<!-- maven plugins -->
217204
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
218-
<maven-war-plugin.version>2.4</maven-war-plugin.version>
219205
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
220206
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
221207
<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>

‎spring-hibernate4/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎spring-jpa/.classpath‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2626
<attributes>
2727
<attribute name="maven.pomderived" value="true"/>
28-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2928
</attributes>
3029
</classpathentry>
3130
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">

‎spring-jpa/.springBeans‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beansProjectDescription>
33
<version>1</version>
4-
<pluginVersion><![CDATA[3.2.0.201303060654-RELEASE]]></pluginVersion>
4+
<pluginVersion><![CDATA[3.6.0.201407080615-RELEASE]]></pluginVersion>
55
<configSuffixes>
66
<configSuffix><![CDATA[xml]]></configSuffix>
77
</configSuffixes>
88
<enableImports><![CDATA[false]]></enableImports>
99
<configs>
10-
<config>src/main/webapp/WEB-INF/mvc-servlet.xml</config>
1110
</configs>
11+
<autoconfigs>
12+
</autoconfigs>
1213
<configSets>
1314
</configSets>
1415
</beansProjectDescription>

‎spring-jpa/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@
66
<artifactId>spring-jpa</artifactId>
77
<version>0.1-SNAPSHOT</version>
88

9-
<packaging>war</packaging>
109
<name>spring-jpa</name>
1110

1211
<dependencies>
1312

1413
<!-- Spring -->
1514

16-
<dependency>
17-
<groupId>org.springframework</groupId>
18-
<artifactId>spring-web</artifactId>
19-
<version>${org.springframework.version}</version>
20-
</dependency>
2115
<dependency>
2216
<groupId>org.springframework</groupId>
2317
<artifactId>spring-orm</artifactId>
@@ -130,12 +124,6 @@
130124
</configuration>
131125
</plugin>
132126

133-
<plugin>
134-
<groupId>org.apache.maven.plugins</groupId>
135-
<artifactId>maven-war-plugin</artifactId>
136-
<version>${maven-war-plugin.version}</version>
137-
</plugin>
138-
139127
<plugin>
140128
<groupId>org.apache.maven.plugins</groupId>
141129
<artifactId>maven-surefire-plugin</artifactId>
@@ -205,13 +193,12 @@
205193

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

208-
209196
<!-- maven plugins -->
210197
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
211-
<maven-war-plugin.version>2.4</maven-war-plugin.version>
212198
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
213199
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
214200
<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
201+
<!-- <maven-war-plugin.version>2.4</maven-war-plugin.version> -->
215202

216203
</properties>
217204

‎spring-jpa/src/main/webapp/WEB-INF/mvc-servlet.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎spring-jpa/src/main/webapp/WEB-INF/view/sample.jsp‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)