Skip to content

Commit 6f7ebf8

Browse files
lor6lor6
committed
fix conflicts
2 parents ba8fce5 + 01492d1 commit 6f7ebf8

1,803 files changed

Lines changed: 33733 additions & 6135 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,5 @@ persistence-modules/hibernate5/transaction.log
7676
apache-avro/src/main/java/com/baeldung/avro/model/
7777
jta/transaction-logs/
7878
software-security/sql-injection-samples/derby.log
79-
spring-soap/src/main/java/com/baeldung/springsoap/gen/
79+
spring-soap/src/main/java/com/baeldung/springsoap/gen/
80+
/report-*.json

‎apache-meecrowave/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<properties>
6161
<maven.compiler.source>1.8</maven.compiler.source>
6262
<maven.compiler.target>1.8</maven.compiler.target>
63-
<junit.version>4.10</junit.version>
6463
<meecrowave-junit.version>1.2.0</meecrowave-junit.version>
6564
<okhttp.version>3.10.0</okhttp.version>
6665
<meecrowave-jpa.version>1.2.1</meecrowave-jpa.version>

‎apache-olingo/Samples.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## OData test URLs
2+
3+
This following table contains test URLs that can be used with the Olingo V2 demo project.
4+
5+
| URL | Description |
6+
|------------------------------------------|-------------------------------------------------|
7+
| `http://localhost:8180/odata/$metadata` | fetch OData metadata document |
8+
| `http://localhost:8180/odata/CarMakers?$top=10&$skip=10` | Get 10 entities starting at offset 10 |
9+
| `http://localhost:8180/odata/CarMakers?$count` | Return total count of entities in this set |
10+
| `http://localhost:8180/odata/CarMakers?$filter=startswith(Name,'B')` | Return entities where the *Name* property starts with 'B' |
11+
| `http://localhost:8180/odata/CarModels?$filter=Year eq 2008 and CarMakerDetails/Name eq 'BWM'` | Return *CarModel* entities where the *Name* property of its maker starts with 'B' |
12+
| `http://localhost:8180/odata/CarModels(1L)?$expand=CarMakerDetails` | Return the *CarModel* with primary key '1', along with its maker|
13+
| `http://localhost:8180/odata/CarModels(1L)?$select=Name,Sku` | Return the *CarModel* with primary key '1', returing only its *Name* and *Sku* properties |
14+
| `http://localhost:8180/odata/CarModels?$orderBy=Name asc,Sku desc` | Return *CarModel* entities, ordered by the their *Name* and *Sku* properties |
15+
| `http://localhost:8180/odata/CarModels?$format=json` | Return *CarModel* entities, using a JSON representation|
16+
17+
18+
19+
20+
21+

‎apache-olingo/olingo2/.gitignore‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
HELP.md
2+
/target/
3+
!.mvn/wrapper/maven-wrapper.jar
4+
5+
### STS ###
6+
.apt_generated
7+
.classpath
8+
.factorypath
9+
.project
10+
.settings
11+
.springBeans
12+
.sts4-cache
13+
14+
### IntelliJ IDEA ###
15+
.idea
16+
*.iws
17+
*.iml
18+
*.ipr
19+
20+
### NetBeans ###
21+
/nbproject/private/
22+
/nbbuild/
23+
/dist/
24+
/nbdist/
25+
/.nb-gradle/
26+
/build/
27+
28+
### VS Code ###
29+
.vscode/

‎apache-olingo/olingo2/pom.xml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>org.springframework.boot</groupId>
8+
<artifactId>spring-boot-starter-parent</artifactId>
9+
<version>2.1.3.RELEASE</version>
10+
<relativePath /> <!-- lookup parent from repository -->
11+
</parent>
12+
<groupId>org.baeldung.examples.olingo2</groupId>
13+
<artifactId>olingo2-sample</artifactId>
14+
<version>0.0.1-SNAPSHOT</version>
15+
<name>olingo2-sample</name>
16+
<description>Sample Olingo 2 Project</description>
17+
18+
<properties>
19+
<java.version>1.8</java.version>
20+
<olingo2.version>2.0.11</olingo2.version>
21+
</properties>
22+
23+
<dependencies>
24+
25+
<dependency>
26+
<groupId>org.springframework.boot</groupId>
27+
<artifactId>spring-boot-starter-jersey</artifactId>
28+
</dependency>
29+
30+
31+
<dependency>
32+
<groupId>org.springframework.boot</groupId>
33+
<artifactId>spring-boot-starter-data-jpa</artifactId>
34+
</dependency>
35+
36+
37+
<dependency>
38+
<groupId>com.h2database</groupId>
39+
<artifactId>h2</artifactId>
40+
<scope>runtime</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.springframework.boot</groupId>
44+
<artifactId>spring-boot-configuration-processor</artifactId>
45+
<optional>true</optional>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.projectlombok</groupId>
49+
<artifactId>lombok</artifactId>
50+
<optional>true</optional>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.springframework.boot</groupId>
54+
<artifactId>spring-boot-starter-test</artifactId>
55+
<scope>test</scope>
56+
</dependency>
57+
58+
<!-- Olingo 2 Dependencies -->
59+
<dependency>
60+
<groupId>org.apache.olingo</groupId>
61+
<artifactId>olingo-odata2-core</artifactId>
62+
<version>${olingo2.version}</version>
63+
<!-- Avoid jax-rs version conflict by excluding Olingo's version -->
64+
<exclusions>
65+
<exclusion>
66+
<groupId>javax.ws.rs</groupId>
67+
<artifactId>javax.ws.rs-api</artifactId>
68+
</exclusion>
69+
</exclusions>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.apache.olingo</groupId>
73+
<artifactId>olingo-odata2-api</artifactId>
74+
<version>${olingo2.version}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.apache.olingo</groupId>
78+
<artifactId>olingo-odata2-jpa-processor-api</artifactId>
79+
<version>${olingo2.version}</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.apache.olingo</groupId>
83+
<artifactId>olingo-odata2-jpa-processor-core</artifactId>
84+
<version>${olingo2.version}</version>
85+
</dependency>
86+
<dependency>
87+
<groupId>org.apache.olingo</groupId>
88+
<artifactId>olingo-odata2-jpa-processor-ref</artifactId>
89+
<version>${olingo2.version}</version>
90+
<exclusions>
91+
<exclusion>
92+
<groupId>org.eclipse.persistence</groupId>
93+
<artifactId>eclipselink</artifactId>
94+
</exclusion>
95+
</exclusions>
96+
</dependency>
97+
</dependencies>
98+
99+
<build>
100+
<plugins>
101+
<plugin>
102+
<groupId>org.springframework.boot</groupId>
103+
<artifactId>spring-boot-maven-plugin</artifactId>
104+
</plugin>
105+
</plugins>
106+
</build>
107+
108+
</project>

0 commit comments

Comments
 (0)