diff options
author | Vitaly Takmazov | 2021-03-31 00:21:12 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2021-03-31 00:21:12 +0300 |
commit | b034b3ede4844c6873fef9b2f031d698bc8b0327 (patch) | |
tree | 580975a80d4cd13aae04f9d8aa858674b71bcc0e | |
parent | 03bf67156f0ecfcaf11c76484251bd57422cb897 (diff) |
Gradle -> Maven
-rw-r--r-- | .gitignore | 11 | ||||
-rw-r--r-- | pom.xml | 327 | ||||
-rw-r--r-- | src/main/resources-filtered/1x1.png (renamed from src/main/resources/1x1.png) | bin | 95 -> 95 bytes | |||
-rw-r--r-- | src/main/resources-filtered/Transparent.gif (renamed from src/main/resources/Transparent.gif) | bin | 42 -> 42 bytes | |||
-rw-r--r-- | src/main/resources-filtered/banner.txt (renamed from src/main/resources/banner.txt) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/data-h2.sql (renamed from src/main/resources/data-h2.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.10__favorites_user_uri.sql (renamed from src/main/resources/db/migration/V1.10__favorites_user_uri.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.11__increase pm timestamp precision.sql (renamed from src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.12__drop unused tables.sql (renamed from src/main/resources/db/migration/V1.12__drop unused tables.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.13__drop unused tables.sql (renamed from src/main/resources/db/migration/V1.13__drop unused tables.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.14__drop broken pm_streams.sql (renamed from src/main/resources/db/migration/V1.14__drop broken pm_streams.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.15__drop unused columns add ts for some tables.sql (renamed from src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.16__last seen.sql (renamed from src/main/resources/db/migration/V1.16__last seen.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.17__drop tags column.sql (renamed from src/main/resources/db/migration/V1.17__drop tags column.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.18__increase messages and replies timestamp precision.sql (renamed from src/main/resources/db/migration/V1.18__increase messages and replies timestamp precision.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.19__messages_properties.sql (renamed from src/main/resources/db/migration/V1.19__messages_properties.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.1__Add updated_at field.sql (renamed from src/main/resources/db/migration/V1.1__Add updated_at field.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.20__reply id in messages_properties.sql (renamed from src/main/resources/db/migration/V1.20__reply id in messages_properties.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.21__recreate messages_properties with correct index.sql (renamed from src/main/resources/db/migration/V1.21__recreate messages_properties with correct index.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.22__increase updated_at precision.sql (renamed from src/main/resources/db/migration/V1.22__increase updated_at precision.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.2__Drop telegram_chats.sql (renamed from src/main/resources/db/migration/V1.2__Drop telegram_chats.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.3__Nullable user_id column in auth table.sql (renamed from src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.4__ActivityPub followers.sql (renamed from src/main/resources/db/migration/V1.4__ActivityPub followers.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.5__Drop acct index.sql (renamed from src/main/resources/db/migration/V1.5__Drop acct index.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.6__user_uri.sql (renamed from src/main/resources/db/migration/V1.6__user_uri.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.7__reply_uri.sql (renamed from src/main/resources/db/migration/V1.7__reply_uri.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.8__html reply.sql (renamed from src/main/resources/db/migration/V1.8__html reply.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/db/migration/V1.9__reply_uri_index.sql (renamed from src/main/resources/db/migration/V1.9__reply_uri_index.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/errors.properties (renamed from src/main/resources/errors.properties) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/errors_ru.properties (renamed from src/main/resources/errors_ru.properties) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/juick-test-key.p12 (renamed from src/main/resources/juick-test-key.p12) | bin | 2389 -> 2389 bytes | |||
-rw-r--r-- | src/main/resources-filtered/juick.png (renamed from src/main/resources/juick.png) | bin | 4298 -> 4298 bytes | |||
-rw-r--r-- | src/main/resources-filtered/messages.properties (renamed from src/main/resources/messages.properties) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/messages_ru.properties (renamed from src/main/resources/messages_ru.properties) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/pg_schema_wip (renamed from src/main/resources/pg_schema_wip) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/rome.properties (renamed from src/main/resources/rome.properties) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/schema-h2.sql (renamed from src/main/resources/schema-h2.sql) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/static/av-96.png (renamed from src/main/resources/static/av-96.png) | bin | 2018 -> 2018 bytes | |||
-rw-r--r-- | src/main/resources-filtered/static/durov.png (renamed from src/main/resources/static/durov.png) | bin | 31025 -> 31025 bytes | |||
-rw-r--r-- | src/main/resources-filtered/static/favicon.png (renamed from src/main/resources/static/favicon.png) | bin | 244 -> 244 bytes | |||
-rw-r--r-- | src/main/resources-filtered/static/logo.png (renamed from src/main/resources/static/logo.png) | bin | 1184 -> 1184 bytes | |||
-rw-r--r-- | src/main/resources-filtered/static/logo@2x.png (renamed from src/main/resources/static/logo@2x.png) | bin | 4822 -> 4822 bytes | |||
-rw-r--r-- | src/main/resources-filtered/static/tagscloud.png (renamed from src/main/resources/static/tagscloud.png) | bin | 42316 -> 42316 bytes | |||
-rw-r--r-- | src/main/resources-filtered/templates/email/html.html (renamed from src/main/resources/templates/email/html.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/email/plaintext.html (renamed from src/main/resources/templates/email/plaintext.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/layouts/default.html (renamed from src/main/resources/templates/layouts/default.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/layouts/login.html (renamed from src/main/resources/templates/layouts/login.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/layouts/note.html (renamed from src/main/resources/templates/layouts/note.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/404.html (renamed from src/main/resources/templates/views/404.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/blog.html (renamed from src/main/resources/templates/views/blog.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/blog_tags.html (renamed from src/main/resources/templates/views/blog_tags.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/help.html (renamed from src/main/resources/templates/views/help.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/index.html (renamed from src/main/resources/templates/views/index.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/login_success.html (renamed from src/main/resources/templates/views/login_success.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/macros/tags.html (renamed from src/main/resources/templates/views/macros/tags.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/footer.html (renamed from src/main/resources/templates/views/partial/footer.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/homecolumn.html (renamed from src/main/resources/templates/views/partial/homecolumn.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/message.html (renamed from src/main/resources/templates/views/partial/message.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/navigation.html (renamed from src/main/resources/templates/views/partial/navigation.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/settings_tabs.html (renamed from src/main/resources/templates/views/partial/settings_tabs.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/tagcolumn.html (renamed from src/main/resources/templates/views/partial/tagcolumn.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/tags.html (renamed from src/main/resources/templates/views/partial/tags.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/usercolumn.html (renamed from src/main/resources/templates/views/partial/usercolumn.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/partial/usertags.html (renamed from src/main/resources/templates/views/partial/usertags.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/pm_inbox.html (renamed from src/main/resources/templates/views/pm_inbox.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/pm_sent.html (renamed from src/main/resources/templates/views/pm_sent.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/post.html (renamed from src/main/resources/templates/views/post.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/post_success.html (renamed from src/main/resources/templates/views/post_success.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/settings_about.html (renamed from src/main/resources/templates/views/settings_about.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/settings_auth-email.html (renamed from src/main/resources/templates/views/settings_auth-email.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/settings_main.html (renamed from src/main/resources/templates/views/settings_main.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/settings_password.html (renamed from src/main/resources/templates/views/settings_password.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/settings_privacy.html (renamed from src/main/resources/templates/views/settings_privacy.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/settings_result.html (renamed from src/main/resources/templates/views/settings_result.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/signup.html (renamed from src/main/resources/templates/views/signup.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/signup_result.html (renamed from src/main/resources/templates/views/signup_result.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/thread.html (renamed from src/main/resources/templates/views/thread.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/templates/views/users.html (renamed from src/main/resources/templates/views/users.html) | 0 | ||||
-rw-r--r-- | src/main/resources-filtered/testkey.p8 (renamed from src/main/resources/testkey.p8) | 0 | ||||
-rw-r--r-- | src/main/resources/application.properties | 1 |
80 files changed, 334 insertions, 5 deletions
@@ -17,9 +17,10 @@ **/bin/** **/.DS_Store **/out/** -src/main/resources/static/*.js -src/main/resources/static/*.css -src/main/resources/static/*.svg -src/main/resources/static/*.map -src/main/resources/static/*.LICENSE +target/** +src/main/resources-filtered/static/*.js +src/main/resources-filtered/static/*.css +src/main/resources-filtered/static/*.svg +src/main/resources-filtered/static/*.map +src/main/resources-filtered/static/*.LICENSE src/main/resources/application-durov.properties diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..268d64e3 --- /dev/null +++ b/pom.xml @@ -0,0 +1,327 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>2.4.4</version> + <relativePath /> + </parent> + <groupId>com.juick</groupId> + <artifactId>juick-api</artifactId> + <version>2.0-SNAPSHOT</version> + + <properties> + <maven.compiler.source>15</maven.compiler.source> + <maven.compiler.target>15</maven.compiler.target> + </properties> + + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-security</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-cache</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-json</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-undertow</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.nimbusds</groupId> + <artifactId>nimbus-jose-jwt</artifactId> + </dependency> + <dependency> + <groupId>org.flywaydb</groupId> + <artifactId>flyway-core</artifactId> + </dependency> + <dependency> + <groupId>com.github.ben-manes.caffeine</groupId> + <artifactId>caffeine</artifactId> + </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.4</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + <version>1.9</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-imaging</artifactId> + <version>1.0-alpha2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.8.0</version> + </dependency> + <dependency> + <groupId>io.pebbletemplates</groupId> + <artifactId>pebble-spring5</artifactId> + <version>3.1.5</version> + </dependency> + <dependency> + <groupId>com.github.pengrad</groupId> + <artifactId>java-telegram-bot-api</artifactId> + <version>5.1.0</version> + </dependency> + <dependency> + <groupId>com.github.scribejava</groupId> + <artifactId>scribejava-apis</artifactId> + <version>8.1.0</version> + </dependency> + <dependency> + <groupId>rocks.xmpp</groupId> + <artifactId>xmpp-core-client</artifactId> + <version>0.8.2</version> + </dependency> + <dependency> + <groupId>rocks.xmpp</groupId> + <artifactId>xmpp-extensions-client</artifactId> + <version>0.8.2</version> + </dependency> + <dependency> + <groupId>org.commonmark</groupId> + <artifactId>commonmark</artifactId> + <version>0.17.1</version> + </dependency> + <dependency> + <groupId>org.commonmark</groupId> + <artifactId>commonmark-ext-autolink</artifactId> + <version>0.17.1</version> + </dependency> + <dependency> + <groupId>org.tomitribe</groupId> + <artifactId>tomitribe-http-signatures</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>com.google.api-client</groupId> + <artifactId>google-api-client</artifactId> + <version>1.31.1</version> + </dependency> + <dependency> + <groupId>com.kotcrab.remark</groupId> + <artifactId>remark</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>io.jsonwebtoken</groupId> + <artifactId>jjwt-api</artifactId> + <version>0.11.2</version> + </dependency> + <dependency> + <groupId>io.jsonwebtoken</groupId> + <artifactId>jjwt-jackson</artifactId> + <scope>runtime</scope> + <version>0.11.2</version> + </dependency> + <dependency> + <groupId>io.jsonwebtoken</groupId> + <artifactId>jjwt-impl</artifactId> + <scope>runtime</scope> + <version>0.11.2</version> + </dependency> + <dependency> + <groupId>org.imgscalr</groupId> + <artifactId>imgscalr-lib</artifactId> + <version>4.2</version> + </dependency> + <dependency> + <groupId>org.twitter4j</groupId> + <artifactId>twitter4j-core</artifactId> + <version>4.0.7</version> + </dependency> + <dependency> + <groupId>com.rometools</groupId> + <artifactId>rome</artifactId> + <version>1.15.0</version> + </dependency> + <dependency> + <groupId>com.rometools</groupId> + <artifactId>rome-modules</artifactId> + <version>1.15.0</version> + </dependency> + <dependency> + <groupId>com.twelvemonkeys.imageio</groupId> + <artifactId>imageio-jpeg</artifactId> + <version>3.6.4</version> + </dependency> + <dependency> + <groupId>org.ocpsoft.prettytime</groupId> + <artifactId>prettytime</artifactId> + <version>5.0.0.Final</version> + </dependency> + <dependency> + <groupId>org.springdoc</groupId> + <artifactId>springdoc-openapi-webmvc-core</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> + <groupId>ch.vorburger.mariaDB4j</groupId> + <artifactId>mariaDB4j</artifactId> + <version>2.4.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>1.68</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>npm install</id> + <goals> + <goal>exec</goal> + </goals> + <phase>initialize</phase> + <configuration> + <executable>npm</executable> + <arguments> + <argument>install</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>npm run compile</id> + <goals> + <goal>exec</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <executable>npm</executable> + <arguments> + <argument>run</argument> + <argument>compile</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + </build> + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + <properties> + <activatedProperties>default</activatedProperties> + </properties> + </profile> + <profile> + <id>mysql</id> + <properties> + <activatedProperties>mysql</activatedProperties> + </properties> + </profile> + <profile> + <id>production</id> + <properties> + <activatedProperties>production</activatedProperties> + </properties> + </profile> + </profiles> +</project>
\ No newline at end of file diff --git a/src/main/resources/1x1.png b/src/main/resources-filtered/1x1.png Binary files differindex 1914264c..1914264c 100644 --- a/src/main/resources/1x1.png +++ b/src/main/resources-filtered/1x1.png diff --git a/src/main/resources/Transparent.gif b/src/main/resources-filtered/Transparent.gif Binary files differindex f191b280..f191b280 100644 --- a/src/main/resources/Transparent.gif +++ b/src/main/resources-filtered/Transparent.gif diff --git a/src/main/resources/banner.txt b/src/main/resources-filtered/banner.txt index c81c89f7..c81c89f7 100644 --- a/src/main/resources/banner.txt +++ b/src/main/resources-filtered/banner.txt diff --git a/src/main/resources/data-h2.sql b/src/main/resources-filtered/data-h2.sql index aff3e286..aff3e286 100644 --- a/src/main/resources/data-h2.sql +++ b/src/main/resources-filtered/data-h2.sql diff --git a/src/main/resources/db/migration/V1.10__favorites_user_uri.sql b/src/main/resources-filtered/db/migration/V1.10__favorites_user_uri.sql index 8f382398..8f382398 100644 --- a/src/main/resources/db/migration/V1.10__favorites_user_uri.sql +++ b/src/main/resources-filtered/db/migration/V1.10__favorites_user_uri.sql diff --git a/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql b/src/main/resources-filtered/db/migration/V1.11__increase pm timestamp precision.sql index e83eb621..e83eb621 100644 --- a/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql +++ b/src/main/resources-filtered/db/migration/V1.11__increase pm timestamp precision.sql diff --git a/src/main/resources/db/migration/V1.12__drop unused tables.sql b/src/main/resources-filtered/db/migration/V1.12__drop unused tables.sql index 1599f5f6..1599f5f6 100644 --- a/src/main/resources/db/migration/V1.12__drop unused tables.sql +++ b/src/main/resources-filtered/db/migration/V1.12__drop unused tables.sql diff --git a/src/main/resources/db/migration/V1.13__drop unused tables.sql b/src/main/resources-filtered/db/migration/V1.13__drop unused tables.sql index c35fc92c..c35fc92c 100644 --- a/src/main/resources/db/migration/V1.13__drop unused tables.sql +++ b/src/main/resources-filtered/db/migration/V1.13__drop unused tables.sql diff --git a/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql b/src/main/resources-filtered/db/migration/V1.14__drop broken pm_streams.sql index 448c5ce2..448c5ce2 100644 --- a/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql +++ b/src/main/resources-filtered/db/migration/V1.14__drop broken pm_streams.sql diff --git a/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql b/src/main/resources-filtered/db/migration/V1.15__drop unused columns add ts for some tables.sql index 6b3ab388..6b3ab388 100644 --- a/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql +++ b/src/main/resources-filtered/db/migration/V1.15__drop unused columns add ts for some tables.sql diff --git a/src/main/resources/db/migration/V1.16__last seen.sql b/src/main/resources-filtered/db/migration/V1.16__last seen.sql index 52ca4e90..52ca4e90 100644 --- a/src/main/resources/db/migration/V1.16__last seen.sql +++ b/src/main/resources-filtered/db/migration/V1.16__last seen.sql diff --git a/src/main/resources/db/migration/V1.17__drop tags column.sql b/src/main/resources-filtered/db/migration/V1.17__drop tags column.sql index ebb2d9a6..ebb2d9a6 100644 --- a/src/main/resources/db/migration/V1.17__drop tags column.sql +++ b/src/main/resources-filtered/db/migration/V1.17__drop tags column.sql diff --git a/src/main/resources/db/migration/V1.18__increase messages and replies timestamp precision.sql b/src/main/resources-filtered/db/migration/V1.18__increase messages and replies timestamp precision.sql index 5b298c46..5b298c46 100644 --- a/src/main/resources/db/migration/V1.18__increase messages and replies timestamp precision.sql +++ b/src/main/resources-filtered/db/migration/V1.18__increase messages and replies timestamp precision.sql diff --git a/src/main/resources/db/migration/V1.19__messages_properties.sql b/src/main/resources-filtered/db/migration/V1.19__messages_properties.sql index 2bb3baf2..2bb3baf2 100644 --- a/src/main/resources/db/migration/V1.19__messages_properties.sql +++ b/src/main/resources-filtered/db/migration/V1.19__messages_properties.sql diff --git a/src/main/resources/db/migration/V1.1__Add updated_at field.sql b/src/main/resources-filtered/db/migration/V1.1__Add updated_at field.sql index dac179b1..dac179b1 100644 --- a/src/main/resources/db/migration/V1.1__Add updated_at field.sql +++ b/src/main/resources-filtered/db/migration/V1.1__Add updated_at field.sql diff --git a/src/main/resources/db/migration/V1.20__reply id in messages_properties.sql b/src/main/resources-filtered/db/migration/V1.20__reply id in messages_properties.sql index 2ca5e018..2ca5e018 100644 --- a/src/main/resources/db/migration/V1.20__reply id in messages_properties.sql +++ b/src/main/resources-filtered/db/migration/V1.20__reply id in messages_properties.sql diff --git a/src/main/resources/db/migration/V1.21__recreate messages_properties with correct index.sql b/src/main/resources-filtered/db/migration/V1.21__recreate messages_properties with correct index.sql index 685318af..685318af 100644 --- a/src/main/resources/db/migration/V1.21__recreate messages_properties with correct index.sql +++ b/src/main/resources-filtered/db/migration/V1.21__recreate messages_properties with correct index.sql diff --git a/src/main/resources/db/migration/V1.22__increase updated_at precision.sql b/src/main/resources-filtered/db/migration/V1.22__increase updated_at precision.sql index 22034ea2..22034ea2 100644 --- a/src/main/resources/db/migration/V1.22__increase updated_at precision.sql +++ b/src/main/resources-filtered/db/migration/V1.22__increase updated_at precision.sql diff --git a/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql b/src/main/resources-filtered/db/migration/V1.2__Drop telegram_chats.sql index c8faee0d..c8faee0d 100644 --- a/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql +++ b/src/main/resources-filtered/db/migration/V1.2__Drop telegram_chats.sql diff --git a/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql b/src/main/resources-filtered/db/migration/V1.3__Nullable user_id column in auth table.sql index ced85ade..ced85ade 100644 --- a/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql +++ b/src/main/resources-filtered/db/migration/V1.3__Nullable user_id column in auth table.sql diff --git a/src/main/resources/db/migration/V1.4__ActivityPub followers.sql b/src/main/resources-filtered/db/migration/V1.4__ActivityPub followers.sql index 16b39f62..16b39f62 100644 --- a/src/main/resources/db/migration/V1.4__ActivityPub followers.sql +++ b/src/main/resources-filtered/db/migration/V1.4__ActivityPub followers.sql diff --git a/src/main/resources/db/migration/V1.5__Drop acct index.sql b/src/main/resources-filtered/db/migration/V1.5__Drop acct index.sql index 58757d88..58757d88 100644 --- a/src/main/resources/db/migration/V1.5__Drop acct index.sql +++ b/src/main/resources-filtered/db/migration/V1.5__Drop acct index.sql diff --git a/src/main/resources/db/migration/V1.6__user_uri.sql b/src/main/resources-filtered/db/migration/V1.6__user_uri.sql index c302907c..c302907c 100644 --- a/src/main/resources/db/migration/V1.6__user_uri.sql +++ b/src/main/resources-filtered/db/migration/V1.6__user_uri.sql diff --git a/src/main/resources/db/migration/V1.7__reply_uri.sql b/src/main/resources-filtered/db/migration/V1.7__reply_uri.sql index 9ec35485..9ec35485 100644 --- a/src/main/resources/db/migration/V1.7__reply_uri.sql +++ b/src/main/resources-filtered/db/migration/V1.7__reply_uri.sql diff --git a/src/main/resources/db/migration/V1.8__html reply.sql b/src/main/resources-filtered/db/migration/V1.8__html reply.sql index 9f939971..9f939971 100644 --- a/src/main/resources/db/migration/V1.8__html reply.sql +++ b/src/main/resources-filtered/db/migration/V1.8__html reply.sql diff --git a/src/main/resources/db/migration/V1.9__reply_uri_index.sql b/src/main/resources-filtered/db/migration/V1.9__reply_uri_index.sql index 0ee3c77f..0ee3c77f 100644 --- a/src/main/resources/db/migration/V1.9__reply_uri_index.sql +++ b/src/main/resources-filtered/db/migration/V1.9__reply_uri_index.sql diff --git a/src/main/resources/errors.properties b/src/main/resources-filtered/errors.properties index 6040582e..6040582e 100644 --- a/src/main/resources/errors.properties +++ b/src/main/resources-filtered/errors.properties diff --git a/src/main/resources/errors_ru.properties b/src/main/resources-filtered/errors_ru.properties index a803a7cd..a803a7cd 100644 --- a/src/main/resources/errors_ru.properties +++ b/src/main/resources-filtered/errors_ru.properties diff --git a/src/main/resources/juick-test-key.p12 b/src/main/resources-filtered/juick-test-key.p12 Binary files differindex 254004ec..254004ec 100644 --- a/src/main/resources/juick-test-key.p12 +++ b/src/main/resources-filtered/juick-test-key.p12 diff --git a/src/main/resources/juick.png b/src/main/resources-filtered/juick.png Binary files differindex a7b0e901..a7b0e901 100644 --- a/src/main/resources/juick.png +++ b/src/main/resources-filtered/juick.png diff --git a/src/main/resources/messages.properties b/src/main/resources-filtered/messages.properties index 2aceae3d..2aceae3d 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources-filtered/messages.properties diff --git a/src/main/resources/messages_ru.properties b/src/main/resources-filtered/messages_ru.properties index 487bf7d7..487bf7d7 100644 --- a/src/main/resources/messages_ru.properties +++ b/src/main/resources-filtered/messages_ru.properties diff --git a/src/main/resources/pg_schema_wip b/src/main/resources-filtered/pg_schema_wip index 61178495..61178495 100644 --- a/src/main/resources/pg_schema_wip +++ b/src/main/resources-filtered/pg_schema_wip diff --git a/src/main/resources/rome.properties b/src/main/resources-filtered/rome.properties index a50de51b..a50de51b 100644 --- a/src/main/resources/rome.properties +++ b/src/main/resources-filtered/rome.properties diff --git a/src/main/resources/schema-h2.sql b/src/main/resources-filtered/schema-h2.sql index c1b398bd..c1b398bd 100644 --- a/src/main/resources/schema-h2.sql +++ b/src/main/resources-filtered/schema-h2.sql diff --git a/src/main/resources/static/av-96.png b/src/main/resources-filtered/static/av-96.png Binary files differindex 911c0522..911c0522 100644 --- a/src/main/resources/static/av-96.png +++ b/src/main/resources-filtered/static/av-96.png diff --git a/src/main/resources/static/durov.png b/src/main/resources-filtered/static/durov.png Binary files differindex abb80940..abb80940 100644 --- a/src/main/resources/static/durov.png +++ b/src/main/resources-filtered/static/durov.png diff --git a/src/main/resources/static/favicon.png b/src/main/resources-filtered/static/favicon.png Binary files differindex bc7161e2..bc7161e2 100644 --- a/src/main/resources/static/favicon.png +++ b/src/main/resources-filtered/static/favicon.png diff --git a/src/main/resources/static/logo.png b/src/main/resources-filtered/static/logo.png Binary files differindex 933f6099..933f6099 100644 --- a/src/main/resources/static/logo.png +++ b/src/main/resources-filtered/static/logo.png diff --git a/src/main/resources/static/logo@2x.png b/src/main/resources-filtered/static/logo@2x.png Binary files differindex 6febeaf9..6febeaf9 100644 --- a/src/main/resources/static/logo@2x.png +++ b/src/main/resources-filtered/static/logo@2x.png diff --git a/src/main/resources/static/tagscloud.png b/src/main/resources-filtered/static/tagscloud.png Binary files differindex 3e1bf169..3e1bf169 100644 --- a/src/main/resources/static/tagscloud.png +++ b/src/main/resources-filtered/static/tagscloud.png diff --git a/src/main/resources/templates/email/html.html b/src/main/resources-filtered/templates/email/html.html index 086df532..086df532 100644 --- a/src/main/resources/templates/email/html.html +++ b/src/main/resources-filtered/templates/email/html.html diff --git a/src/main/resources/templates/email/plaintext.html b/src/main/resources-filtered/templates/email/plaintext.html index a0df0038..a0df0038 100644 --- a/src/main/resources/templates/email/plaintext.html +++ b/src/main/resources-filtered/templates/email/plaintext.html diff --git a/src/main/resources/templates/layouts/default.html b/src/main/resources-filtered/templates/layouts/default.html index d3ce7dce..d3ce7dce 100644 --- a/src/main/resources/templates/layouts/default.html +++ b/src/main/resources-filtered/templates/layouts/default.html diff --git a/src/main/resources/templates/layouts/login.html b/src/main/resources-filtered/templates/layouts/login.html index 4a3be9b8..4a3be9b8 100644 --- a/src/main/resources/templates/layouts/login.html +++ b/src/main/resources-filtered/templates/layouts/login.html diff --git a/src/main/resources/templates/layouts/note.html b/src/main/resources-filtered/templates/layouts/note.html index e832dc63..e832dc63 100644 --- a/src/main/resources/templates/layouts/note.html +++ b/src/main/resources-filtered/templates/layouts/note.html diff --git a/src/main/resources/templates/views/404.html b/src/main/resources-filtered/templates/views/404.html index 02a790e6..02a790e6 100644 --- a/src/main/resources/templates/views/404.html +++ b/src/main/resources-filtered/templates/views/404.html diff --git a/src/main/resources/templates/views/blog.html b/src/main/resources-filtered/templates/views/blog.html index 8d6a6581..8d6a6581 100644 --- a/src/main/resources/templates/views/blog.html +++ b/src/main/resources-filtered/templates/views/blog.html diff --git a/src/main/resources/templates/views/blog_tags.html b/src/main/resources-filtered/templates/views/blog_tags.html index 48e517eb..48e517eb 100644 --- a/src/main/resources/templates/views/blog_tags.html +++ b/src/main/resources-filtered/templates/views/blog_tags.html diff --git a/src/main/resources/templates/views/help.html b/src/main/resources-filtered/templates/views/help.html index 169ccb3f..169ccb3f 100644 --- a/src/main/resources/templates/views/help.html +++ b/src/main/resources-filtered/templates/views/help.html diff --git a/src/main/resources/templates/views/index.html b/src/main/resources-filtered/templates/views/index.html index e85a3aa1..e85a3aa1 100644 --- a/src/main/resources/templates/views/index.html +++ b/src/main/resources-filtered/templates/views/index.html diff --git a/src/main/resources/templates/views/login_success.html b/src/main/resources-filtered/templates/views/login_success.html index ee71f12f..ee71f12f 100644 --- a/src/main/resources/templates/views/login_success.html +++ b/src/main/resources-filtered/templates/views/login_success.html diff --git a/src/main/resources/templates/views/macros/tags.html b/src/main/resources-filtered/templates/views/macros/tags.html index 08687f5a..08687f5a 100644 --- a/src/main/resources/templates/views/macros/tags.html +++ b/src/main/resources-filtered/templates/views/macros/tags.html diff --git a/src/main/resources/templates/views/partial/footer.html b/src/main/resources-filtered/templates/views/partial/footer.html index 9a627373..9a627373 100644 --- a/src/main/resources/templates/views/partial/footer.html +++ b/src/main/resources-filtered/templates/views/partial/footer.html diff --git a/src/main/resources/templates/views/partial/homecolumn.html b/src/main/resources-filtered/templates/views/partial/homecolumn.html index a4cca153..a4cca153 100644 --- a/src/main/resources/templates/views/partial/homecolumn.html +++ b/src/main/resources-filtered/templates/views/partial/homecolumn.html diff --git a/src/main/resources/templates/views/partial/message.html b/src/main/resources-filtered/templates/views/partial/message.html index 47dfb6c5..47dfb6c5 100644 --- a/src/main/resources/templates/views/partial/message.html +++ b/src/main/resources-filtered/templates/views/partial/message.html diff --git a/src/main/resources/templates/views/partial/navigation.html b/src/main/resources-filtered/templates/views/partial/navigation.html index 184c8f2b..184c8f2b 100644 --- a/src/main/resources/templates/views/partial/navigation.html +++ b/src/main/resources-filtered/templates/views/partial/navigation.html diff --git a/src/main/resources/templates/views/partial/settings_tabs.html b/src/main/resources-filtered/templates/views/partial/settings_tabs.html index 00f7068a..00f7068a 100644 --- a/src/main/resources/templates/views/partial/settings_tabs.html +++ b/src/main/resources-filtered/templates/views/partial/settings_tabs.html diff --git a/src/main/resources/templates/views/partial/tagcolumn.html b/src/main/resources-filtered/templates/views/partial/tagcolumn.html index a7728ef3..a7728ef3 100644 --- a/src/main/resources/templates/views/partial/tagcolumn.html +++ b/src/main/resources-filtered/templates/views/partial/tagcolumn.html diff --git a/src/main/resources/templates/views/partial/tags.html b/src/main/resources-filtered/templates/views/partial/tags.html index 4d05b7fb..4d05b7fb 100644 --- a/src/main/resources/templates/views/partial/tags.html +++ b/src/main/resources-filtered/templates/views/partial/tags.html diff --git a/src/main/resources/templates/views/partial/usercolumn.html b/src/main/resources-filtered/templates/views/partial/usercolumn.html index ee9ab267..ee9ab267 100644 --- a/src/main/resources/templates/views/partial/usercolumn.html +++ b/src/main/resources-filtered/templates/views/partial/usercolumn.html diff --git a/src/main/resources/templates/views/partial/usertags.html b/src/main/resources-filtered/templates/views/partial/usertags.html index 71d1303e..71d1303e 100644 --- a/src/main/resources/templates/views/partial/usertags.html +++ b/src/main/resources-filtered/templates/views/partial/usertags.html diff --git a/src/main/resources/templates/views/pm_inbox.html b/src/main/resources-filtered/templates/views/pm_inbox.html index f89b2923..f89b2923 100644 --- a/src/main/resources/templates/views/pm_inbox.html +++ b/src/main/resources-filtered/templates/views/pm_inbox.html diff --git a/src/main/resources/templates/views/pm_sent.html b/src/main/resources-filtered/templates/views/pm_sent.html index f0af71d3..f0af71d3 100644 --- a/src/main/resources/templates/views/pm_sent.html +++ b/src/main/resources-filtered/templates/views/pm_sent.html diff --git a/src/main/resources/templates/views/post.html b/src/main/resources-filtered/templates/views/post.html index a77fa3bd..a77fa3bd 100644 --- a/src/main/resources/templates/views/post.html +++ b/src/main/resources-filtered/templates/views/post.html diff --git a/src/main/resources/templates/views/post_success.html b/src/main/resources-filtered/templates/views/post_success.html index 2106f3cb..2106f3cb 100644 --- a/src/main/resources/templates/views/post_success.html +++ b/src/main/resources-filtered/templates/views/post_success.html diff --git a/src/main/resources/templates/views/settings_about.html b/src/main/resources-filtered/templates/views/settings_about.html index 5e308671..5e308671 100644 --- a/src/main/resources/templates/views/settings_about.html +++ b/src/main/resources-filtered/templates/views/settings_about.html diff --git a/src/main/resources/templates/views/settings_auth-email.html b/src/main/resources-filtered/templates/views/settings_auth-email.html index e906d704..e906d704 100644 --- a/src/main/resources/templates/views/settings_auth-email.html +++ b/src/main/resources-filtered/templates/views/settings_auth-email.html diff --git a/src/main/resources/templates/views/settings_main.html b/src/main/resources-filtered/templates/views/settings_main.html index a6cca7a3..a6cca7a3 100644 --- a/src/main/resources/templates/views/settings_main.html +++ b/src/main/resources-filtered/templates/views/settings_main.html diff --git a/src/main/resources/templates/views/settings_password.html b/src/main/resources-filtered/templates/views/settings_password.html index 99c1676e..99c1676e 100644 --- a/src/main/resources/templates/views/settings_password.html +++ b/src/main/resources-filtered/templates/views/settings_password.html diff --git a/src/main/resources/templates/views/settings_privacy.html b/src/main/resources-filtered/templates/views/settings_privacy.html index 83b87b93..83b87b93 100644 --- a/src/main/resources/templates/views/settings_privacy.html +++ b/src/main/resources-filtered/templates/views/settings_privacy.html diff --git a/src/main/resources/templates/views/settings_result.html b/src/main/resources-filtered/templates/views/settings_result.html index d87a5ea6..d87a5ea6 100644 --- a/src/main/resources/templates/views/settings_result.html +++ b/src/main/resources-filtered/templates/views/settings_result.html diff --git a/src/main/resources/templates/views/signup.html b/src/main/resources-filtered/templates/views/signup.html index d6eb921f..d6eb921f 100644 --- a/src/main/resources/templates/views/signup.html +++ b/src/main/resources-filtered/templates/views/signup.html diff --git a/src/main/resources/templates/views/signup_result.html b/src/main/resources-filtered/templates/views/signup_result.html index b204e1b8..b204e1b8 100644 --- a/src/main/resources/templates/views/signup_result.html +++ b/src/main/resources-filtered/templates/views/signup_result.html diff --git a/src/main/resources/templates/views/thread.html b/src/main/resources-filtered/templates/views/thread.html index f1563a7c..f1563a7c 100644 --- a/src/main/resources/templates/views/thread.html +++ b/src/main/resources-filtered/templates/views/thread.html diff --git a/src/main/resources/templates/views/users.html b/src/main/resources-filtered/templates/views/users.html index 702ba6b9..702ba6b9 100644 --- a/src/main/resources/templates/views/users.html +++ b/src/main/resources-filtered/templates/views/users.html diff --git a/src/main/resources/testkey.p8 b/src/main/resources-filtered/testkey.p8 index 1e5d0f98..1e5d0f98 100644 --- a/src/main/resources/testkey.p8 +++ b/src/main/resources-filtered/testkey.p8 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 60bf2021..06fc9537 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,4 +5,5 @@ spring.jackson.serialization.write-empty-json-arrays=true spring.h2.console.enabled=true spring.datasource.generate-unique-name=false spring.datasource.platform=h2 +spring.profiles.active=@activatedProperties@ |