Skip to content

Commit 92cee95

Browse files
honeymoosehoneymoose
committed
Merge pull request 'Update the version also move the folder' (#30) from apache into main
Reviewed-on: https://src.isharkfly.com/iSharkFly-Docs/java-tutorials/pulls/30
2 parents cdb8e81 + 1bad34f commit 92cee95

20 files changed

Lines changed: 24 additions & 19 deletions

File tree

‎.idea/compiler.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/encodings.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apache-velocity/README.md renamed to apache/apache-velocity/README.md

File renamed without changes.

apache-velocity/pom.xml renamed to apache/apache-velocity/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<name>apache-velocity</name>
1010

1111
<parent>
12-
<groupId>com.baeldung</groupId>
13-
<artifactId>parent-modules</artifactId>
14-
<version>1.0.0-SNAPSHOT</version>
12+
<groupId>com.ossez.apache</groupId>
13+
<artifactId>apache</artifactId>
14+
<version>0.0.2-SNAPSHOT</version>
1515
</parent>
1616

1717
<dependencies>

apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java renamed to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/model/Product.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.apache.velocity.model;
1+
package com.ossez.apache.velocity.model;
22

33
public class Product {
44

apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java renamed to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/service/ProductService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.baeldung.apache.velocity.service;
1+
package com.ossez.apache.velocity.service;
22

3-
import com.baeldung.apache.velocity.model.Product;
3+
import com.ossez.apache.velocity.model.Product;
44
import org.slf4j.Logger;
55
import org.slf4j.LoggerFactory;
66

apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java renamed to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/LayoutServlet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.baeldung.apache.velocity.servlet;
1+
package com.ossez.apache.velocity.servlet;
22

3-
import com.baeldung.apache.velocity.model.Product;
4-
import com.baeldung.apache.velocity.service.ProductService;
3+
import com.ossez.apache.velocity.model.Product;
4+
import com.ossez.apache.velocity.service.ProductService;
55
import org.apache.velocity.Template;
66
import org.apache.velocity.context.Context;
77
import org.apache.velocity.tools.view.VelocityLayoutServlet;

apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java renamed to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/ProductServlet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.baeldung.apache.velocity.servlet;
1+
package com.ossez.apache.velocity.servlet;
22

3-
import com.baeldung.apache.velocity.model.Product;
4-
import com.baeldung.apache.velocity.service.ProductService;
3+
import com.ossez.apache.velocity.model.Product;
4+
import com.ossez.apache.velocity.service.ProductService;
55
import org.apache.velocity.Template;
66
import org.apache.velocity.context.Context;
77
import org.apache.velocity.tools.view.VelocityViewServlet;

apache-velocity/src/main/resources/logback.xml renamed to apache/apache-velocity/src/main/resources/logback.xml

File renamed without changes.

apache-velocity/src/main/webapp/WEB-INF/velocity.properties renamed to apache/apache-velocity/src/main/webapp/WEB-INF/velocity.properties

File renamed without changes.

0 commit comments

Comments
 (0)