Skip to content

Commit a40b865

Browse files
mikereichemikereiche
committed
Reorganize the github repository.
Closes #1503.
1 parent 258dc55 commit a40b865

File tree

449 files changed

+393
-276
lines changed

Some content is hidden

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

449 files changed

+393
-276
lines changed

‎README.adoc

+15
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,21 @@ Building the documentation builds also the project without running tests.
178178
----
179179

180180
The generated documentation is available from `target/site/reference/html/index.html`.
181+
It can be staged and accessed via :
182+
183+
[source,bash]
184+
----
185+
docs=`pwd`/target/site/reference/html
186+
cd /tmp
187+
# see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site
188+
git clone [email protected]:mikereiche/staged.git -b gh-pages
189+
cd staged
190+
cp -R $docs/* .
191+
git add .
192+
git commit --message "stage for review"
193+
git push origin gh-pages
194+
----
195+
https://mikereiche.github.io/staged/index.html
181196

182197
== Examples
183198

‎pom.xml

+8-276
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>org.springframework.data</groupId>
7-
<artifactId>spring-data-couchbase</artifactId>
7+
<artifactId>spring-data-couchbase-parent</artifactId>
88
<version>5.0.0-SNAPSHOT</version>
9+
<packaging>pom</packaging>
910

10-
<name>Spring Data Couchbase</name>
11+
<name>Spring Data Couchbase Parent</name>
1112
<description>Spring Data integration for Couchbase</description>
1213
<url>https://github.com/spring-projects/spring-data-couchbase</url>
1314

@@ -17,222 +18,24 @@
1718
<version>3.0.0-SNAPSHOT</version>
1819
</parent>
1920

21+
<modules>
22+
<module>spring-data-couchbase</module>
23+
<module>spring-data-couchbase-distribution</module>
24+
</modules>
25+
2026
<properties>
2127
<couchbase>3.3.2</couchbase>
2228
<couchbase.osgi>3.3.2</couchbase.osgi>
2329
<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
2430
<java-module-name>spring.data.couchbase</java-module-name>
25-
<jodatime>2.10.13</jodatime>
26-
<jakarta.validation>3.0.1</jakarta.validation>
27-
<hibernate.validator>7.0.1.Final</hibernate.validator>
28-
<apt>1.1.3</apt>
29-
<querydsl>5.0.0</querydsl>
30-
<mysema.querydsl>3.7.4</mysema.querydsl>
3131
</properties>
3232

33-
<dependencyManagement>
34-
<dependencies>
35-
<dependency>
36-
<groupId>org.testcontainers</groupId>
37-
<artifactId>testcontainers-bom</artifactId>
38-
<version>${testcontainers}</version>
39-
<type>pom</type>
40-
<scope>import</scope>
41-
</dependency>
42-
</dependencies>
43-
</dependencyManagement>
44-
4533
<dependencies>
46-
47-
<dependency>
48-
<groupId>com.querydsl</groupId>
49-
<artifactId>querydsl-apt</artifactId>
50-
<version>${querydsl}</version>
51-
<scope>provided</scope>
52-
</dependency>
53-
54-
<dependency>
55-
<groupId>org.springframework</groupId>
56-
<artifactId>spring-context-support</artifactId>
57-
</dependency>
58-
59-
<dependency>
60-
<groupId>org.springframework</groupId>
61-
<artifactId>spring-web</artifactId>
62-
</dependency>
63-
64-
<dependency>
65-
<groupId>org.springframework</groupId>
66-
<artifactId>spring-tx</artifactId>
67-
</dependency>
68-
69-
<dependency>
70-
<groupId>${project.groupId}</groupId>
71-
<artifactId>spring-data-commons</artifactId>
72-
<version>${springdata.commons}</version>
73-
</dependency>
74-
7534
<dependency>
7635
<groupId>com.couchbase.client</groupId>
7736
<artifactId>java-client</artifactId>
7837
<version>${couchbase}</version>
7938
</dependency>
80-
81-
<!-- CDI -->
82-
<dependency>
83-
<groupId>jakarta.enterprise</groupId>
84-
<artifactId>jakarta.enterprise.cdi-api</artifactId>
85-
<version>3.0.0</version>
86-
</dependency>
87-
88-
<dependency>
89-
<groupId>org.springframework</groupId>
90-
<artifactId>spring-test</artifactId>
91-
<version>${spring}</version>
92-
<scope>test</scope>
93-
</dependency>
94-
95-
<dependency>
96-
<groupId>org.hibernate.validator</groupId>
97-
<artifactId>hibernate-validator</artifactId>
98-
<version>7.0.1.Final</version>
99-
<scope>test</scope>
100-
</dependency>
101-
102-
<dependency>
103-
<groupId>org.apache.httpcomponents</groupId>
104-
<artifactId>httpclient</artifactId>
105-
<version>4.5.13</version>
106-
<scope>test</scope>
107-
</dependency>
108-
109-
<dependency>
110-
<groupId>io.projectreactor</groupId>
111-
<artifactId>reactor-test</artifactId>
112-
<scope>test</scope>
113-
</dependency>
114-
115-
<dependency>
116-
<groupId>com.fasterxml.jackson.core</groupId>
117-
<artifactId>jackson-databind</artifactId>
118-
</dependency>
119-
120-
<dependency>
121-
<groupId>joda-time</groupId>
122-
<artifactId>joda-time</artifactId>
123-
<version>${jodatime}</version>
124-
<optional>true</optional>
125-
</dependency>
126-
127-
<dependency>
128-
<groupId>org.testcontainers</groupId>
129-
<artifactId>testcontainers</artifactId>
130-
<scope>test</scope>
131-
</dependency>
132-
133-
<!-- JSR 303 Validation -->
134-
<dependency>
135-
<groupId>jakarta.validation</groupId>
136-
<artifactId>jakarta.validation-api</artifactId>
137-
<version>${validation}</version>
138-
</dependency>
139-
140-
<dependency>
141-
<groupId>jakarta.el</groupId>
142-
<artifactId>jakarta.el-api</artifactId>
143-
<version>4.0.0</version>
144-
<scope>provided</scope>
145-
<optional>true</optional>
146-
</dependency>
147-
148-
<dependency>
149-
<groupId>javax.el</groupId>
150-
<artifactId>javax.el-api</artifactId>
151-
<version>3.0.0</version>
152-
<scope>test</scope>
153-
</dependency>
154-
155-
<dependency>
156-
<groupId>org.glassfish</groupId>
157-
<artifactId>jakarta.el</artifactId>
158-
<version>4.0.2</version>
159-
<scope>provided</scope>
160-
<optional>true</optional>
161-
</dependency>
162-
163-
<!-- CDI -->
164-
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
165-
<dependency>
166-
<groupId>org.apache.geronimo.specs</groupId>
167-
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
168-
<version>1.0.1</version>
169-
<scope>test</scope>
170-
</dependency>
171-
172-
<dependency>
173-
<groupId>javax.interceptor</groupId>
174-
<artifactId>javax.interceptor-api</artifactId>
175-
<version>1.2.1</version>
176-
<scope>test</scope>
177-
</dependency>
178-
179-
<dependency>
180-
<groupId>org.apache.openwebbeans</groupId>
181-
<artifactId>openwebbeans-se</artifactId>
182-
<version>${webbeans}</version>
183-
<scope>test</scope>
184-
</dependency>
185-
186-
<dependency>
187-
<groupId>com.couchbase.mock</groupId>
188-
<artifactId>CouchbaseMock</artifactId>
189-
<version>1.5.25</version>
190-
<scope>test</scope>
191-
</dependency>
192-
193-
<dependency>
194-
<groupId>com.squareup.okhttp3</groupId>
195-
<artifactId>okhttp</artifactId>
196-
<version>4.8.1</version>
197-
<scope>test</scope>
198-
</dependency>
199-
200-
<dependency>
201-
<groupId>com.squareup.okhttp3</groupId>
202-
<artifactId>okhttp-tls</artifactId>
203-
<version>4.8.1</version>
204-
<scope>test</scope>
205-
</dependency>
206-
207-
<!-- Kotlin extension -->
208-
<dependency>
209-
<groupId>org.jetbrains.kotlin</groupId>
210-
<artifactId>kotlin-stdlib</artifactId>
211-
<version>${kotlin}</version>
212-
<optional>true</optional>
213-
</dependency>
214-
215-
<dependency>
216-
<groupId>org.jetbrains.kotlin</groupId>
217-
<artifactId>kotlin-reflect</artifactId>
218-
<version>${kotlin}</version>
219-
<optional>true</optional>
220-
</dependency>
221-
222-
<dependency>
223-
<groupId>org.jetbrains.kotlin</groupId>
224-
<artifactId>kotlin-test</artifactId>
225-
<version>${kotlin}</version>
226-
<scope>test</scope>
227-
</dependency>
228-
229-
<dependency>
230-
<groupId>org.awaitility</groupId>
231-
<artifactId>awaitility</artifactId>
232-
<version>4.0.3</version>
233-
<scope>test</scope>
234-
</dependency>
235-
23639
</dependencies>
23740

23841
<repositories>
@@ -259,75 +62,4 @@
25962
</pluginRepository>
26063
</pluginRepositories>
26164

262-
<build>
263-
<plugins>
264-
<plugin>
265-
<groupId>org.apache.maven.plugins</groupId>
266-
<artifactId>maven-surefire-plugin</artifactId>
267-
<configuration>
268-
<useSystemClassLoader>false</useSystemClassLoader>
269-
<useFile>false</useFile>
270-
<includes>
271-
<include>**/*Test.java</include>
272-
<include>**/*Tests.java</include>
273-
</includes>
274-
<excludes>
275-
<exclude>**/*IntegrationTest.java</exclude>
276-
<exclude>**/*IntegrationTests.java</exclude>
277-
</excludes>
278-
</configuration>
279-
</plugin>
280-
<plugin>
281-
<groupId>org.apache.maven.plugins</groupId>
282-
<artifactId>maven-failsafe-plugin</artifactId>
283-
<configuration>
284-
<useModulePath>false</useModulePath>
285-
<includes>
286-
<include>**/*IntegrationTest.java</include>
287-
<include>**/*IntegrationTests.java</include>
288-
</includes>
289-
</configuration>
290-
<executions>
291-
<execution>
292-
<goals>
293-
<goal>integration-test</goal>
294-
<goal>verify</goal>
295-
</goals>
296-
</execution>
297-
</executions>
298-
</plugin>
299-
<plugin>
300-
<groupId>org.apache.maven.plugins</groupId>
301-
<artifactId>maven-assembly-plugin</artifactId>
302-
</plugin>
303-
<plugin>
304-
<groupId>org.asciidoctor</groupId>
305-
<artifactId>asciidoctor-maven-plugin</artifactId>
306-
</plugin>
307-
<plugin>
308-
<groupId>com.mysema.maven</groupId>
309-
<artifactId>apt-maven-plugin</artifactId>
310-
<version>${apt}</version>
311-
<dependencies>
312-
<dependency>
313-
<groupId>com.querydsl</groupId>
314-
<artifactId>querydsl-apt</artifactId>
315-
<version>${querydsl}</version>
316-
</dependency>
317-
</dependencies>
318-
<executions>
319-
<execution>
320-
<phase>generate-test-sources</phase>
321-
<goals>
322-
<goal>test-process</goal>
323-
</goals>
324-
<configuration>
325-
<outputDirectory>target/generated-test-sources</outputDirectory>
326-
<processor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</processor>
327-
</configuration>
328-
</execution>
329-
</executions>
330-
</plugin>
331-
</plugins>
332-
</build>
33365
</project>

‎spring-data-couchbase-distribution/pom.xml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<artifactId>spring-data-couchbase-distribution</artifactId>
8+
9+
<packaging>pom</packaging>
10+
11+
<name>Spring Data Couchbase - Distribution</name>
12+
<description>Distribution build for Spring Data Couchbase</description>
13+
14+
<parent>
15+
<groupId>org.springframework.data</groupId>
16+
<artifactId>spring-data-couchbase-parent</artifactId>
17+
<version>5.0.0-SNAPSHOT</version>
18+
<relativePath>../pom.xml</relativePath>
19+
</parent>
20+
21+
<properties>
22+
<project.root>${basedir}/..</project.root>
23+
<dist.key>SDCOUCH</dist.key>
24+
</properties>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.apache.maven.plugins</groupId>
30+
<artifactId>maven-assembly-plugin</artifactId>
31+
</plugin>
32+
<plugin>
33+
<groupId>org.asciidoctor</groupId>
34+
<artifactId>asciidoctor-maven-plugin</artifactId>
35+
<configuration>
36+
<attributes>
37+
</attributes>
38+
</configuration>
39+
</plugin>
40+
</plugins>
41+
42+
</build>
43+
44+
</project>

0 commit comments

Comments
 (0)