Skip to content

Conflunce 7.4+ #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RobertPaasche wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conflunce 7.4+ #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 72 additions & 13 deletions confluence-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>git4c</artifactId>
<groupId>com.networkedassets.git4c</groupId>
<version>1.6.2-BETA1</version>
<version>1.6.2-BETA2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -28,6 +28,18 @@
<description>Git4C macro displaying documentation in various forms on pages</description>
<packaging>atlassian-plugin</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.atlassian.confluence</groupId>
<artifactId>confluence-plugins-platform-pom</artifactId>
<version>${confluence.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand All @@ -46,12 +58,19 @@
</exclusion>
</exclusions>
</dependency>

<!-- WIRED TEST RUNNER DEPENDENCIES -->
<dependency>
<groupId>com.atlassian.plugins</groupId>
<artifactId>atlassian-plugins-osgi-testrunner</artifactId>
<version>${plugin.testrunner.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>upm-api</artifactId>
<groupId>com.atlassian.upm</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
Expand All @@ -74,7 +93,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.6</version>
<version>1.7.25</version>
<scope>provided</scope>
</dependency>

Expand All @@ -94,13 +113,11 @@
<dependency>
<groupId>com.atlassian.activeobjects</groupId>
<artifactId>activeobjects-plugin</artifactId>
<version>1.2.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.sal</groupId>
<artifactId>sal-api</artifactId>
<version>2.7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -118,13 +135,11 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.5.6.SEC02</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0.2-atlassian-01</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -166,6 +181,12 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
<version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>kotlin-reflect</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
Expand All @@ -182,7 +203,13 @@
<dependency>
<groupId>com.github.kittinunf.result</groupId>
<artifactId>result</artifactId>
<version>1.1.0</version>
<version>1.2.0</version>
<exclusions>
<exclusion>
<artifactId>kotlin-stdlib</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand All @@ -205,6 +232,16 @@
<artifactId>kotlintest</artifactId>
<version>2.0.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>kotlin-stdlib</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
</exclusion>
<exclusion>
<artifactId>kotlin-reflect</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
Expand All @@ -215,13 +252,11 @@
<dependency>
<groupId>net.java.dev.activeobjects</groupId>
<artifactId>activeobjects-test</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.atlassian.activeobjects</groupId>
<artifactId>activeobjects-test</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -246,13 +281,28 @@
<groupId>uy.kohesive.klutter</groupId>
<artifactId>klutter-core</artifactId>
<version>2.2.0</version>
<exclusions>
<exclusion>
<artifactId>kotlin-stdlib-jre8</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
</exclusion>
<exclusion>
<artifactId>kotlin-stdlib</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.atlassian.confluence.plugins</groupId>
<artifactId>confluence-extractor-api-plugin</artifactId>
<version>${confluence-extractor-api-plugin.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.cache</groupId>
<artifactId>atlassian-cache-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.labs</groupId>
<artifactId>lucene-compat-plugin</artifactId>
Expand Down Expand Up @@ -307,10 +357,14 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.4</version>
<artifactId>commons-lang3</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.6</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -365,13 +419,18 @@
<version>${amps.version}</version>
<extensions>true</extensions>
<configuration>
<jvmArgs>-Xms1g -Xmx2g -XX:MaxPermSize=1g -XX:-UseGCOverheadLimit -server</jvmArgs>
<productVersion>${confluence.version}</productVersion>
<productDataVersion>${confluence.data.version}</productDataVersion>
<enableQuickReload>true</enableQuickReload>
<enableFastdev>false</enableFastdev>
<extractDependencies>false</extractDependencies>
<compressResources>false</compressResources>
<allowGoogleTracking>false</allowGoogleTracking>
<compressJs>false</compressJs>
<systemPropertyVariables>
<webdriver.browser>chrome</webdriver.browser>
<atlassian.dev.mode>false</atlassian.dev.mode>
</systemPropertyVariables>
<instructions>
<Import-Package>
com.atlassian.confluence.plugins.index.api,
Expand Down Expand Up @@ -487,4 +546,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions ...plugin/src/main/java/com/networkedassets/git4c/interfaces/callback/SingleFileMacroView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SingleFileMacroView(
//Yes, it can be null in some cases
val macroUuid = params["uuid"] ?: return ""

val user = userManager.remoteUsername
val user = userManager.remoteUser?.username!!

if (conversionContext.outputType == "pdf" || conversionContext.outputType == "word") {

Expand Down Expand Up @@ -176,4 +176,4 @@ class SingleFileMacroView(
override fun getOutputType(): Macro.OutputType {
return Macro.OutputType.BLOCK
}
}
}
6 changes: 5 additions & 1 deletion confluence-plugin/src/main/resources/atlassian-plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<resource key="icons" name="icons/" type="download" location="images"/>

<web-resource key="ace-${timestamp}" name="Ace editor">
<dependency>com.atlassian.auiplugin:ajs</dependency>
<resource type="download" name="ace.js" location="lib/ace/ace.js"/>
<context>com.networkedassets.git4c.ace</context>
</web-resource>
Expand Down Expand Up @@ -199,6 +200,7 @@
<web-resource key="multi-file-dialog-${timestamp}" name="DoC macro parameter autocompletion">
<dependency>com.atlassian.auiplugin:aui-experimental-tooltips</dependency>
<dependency>com.atlassian.auiplugin:aui-select2</dependency>
<dependency>com.atlassian.auiplugin:ajs</dependency>
<dependency>com.networkedassets.git4c.confluence-plugin:git4c-api-${timestamp}</dependency>
<dependency>com.networkedassets.git4c.confluence-plugin:select2single-${timestamp}</dependency>
<dependency>com.networkedassets.git4c.confluence-plugin:custom-repository-dialog-${timestamp}</dependency>
Expand All @@ -212,6 +214,7 @@
<web-resource key="single-file-dialog-${timestamp}" name="Create Single file dialog">
<dependency>com.atlassian.auiplugin:aui-experimental-iconfont</dependency>
<dependency>confluence.editor.actions:editor-macro-browser</dependency>
<dependency>com.atlassian.auiplugin:ajs</dependency>
<dependency>com.networkedassets.git4c.confluence-plugin:git4c-api-${timestamp}</dependency>
<dependency>com.networkedassets.git4c.confluence-plugin:nouislider-${timestamp}</dependency>
<dependency>com.networkedassets.git4c.confluence-plugin:vuejs-${timestamp}</dependency>
Expand Down Expand Up @@ -241,6 +244,7 @@
</web-resource>

<web-resource key="macro-resources-${timestamp}" name="Macro web resources">
<dependency>com.atlassian.auiplugin:ajs</dependency>
<resource name="polyfill.js" type="download" location="js/polyfill.js"/>

<resource type="download" name="macroResources/"
Expand Down Expand Up @@ -296,6 +300,7 @@

<web-resource key="single-file-macro-resources-${timestamp}" name="Single file macro web resources">
<dependency>com.atlassian.auiplugin:aui-experimental-tooltips</dependency>
<dependency>com.atlassian.auiplugin:ajs</dependency>
<resource type="download" name="images/" location="/images"/>
<resource name="polyfill.js" type="download" location="js/polyfill.js"/>
<resource type="download" name="singleFile/" location="/singleFile/"/>
Expand All @@ -305,7 +310,6 @@
location="singleFile/services/url-service.js"/>
<resource type="download" name="topbartoggler.js" location="singleFile/components/topbartoggler.js"/>
<resource type="download" name="topbar.js" location="singleFile/components/topbar.js"/>
<resource type="download" name="filecontent.js" location="singleFile/components/filecontent.js"/>
<resource type="download" name="infodialog.js" location="singleFile/components/infodialog.js"/>
<resource type="download" name="app.css" location="singleFile/app.css"/>
<resource type="download" name="app.js" location="singleFile/app.js"/>
Expand Down
4 changes: 2 additions & 2 deletions confluence-plugin/src/main/resources/components/tableofcontent/toc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var Git4CToc = {
' </span>' +
' </li>' +
' <ol v-show="data.children.length > 0 && open" style="margin: 0; padding-left: 15px;" v-bind:class="{ \'git4c-toc-first-ul\': level === 0 }">' +
' <toc @anchor="anchor" v-for="t in data.children" :parent="parent" :data="t" :level="level+1" ></toc>' +
' <toc @anchor="anchor" v-for="t in data.children" :parent="parent" :data="t" :level="level+1" v-bind:key="t.anchorName"></toc>' +
' </ol>' +
'</div>'
,
Expand Down Expand Up @@ -97,4 +97,4 @@ var Git4CToc = {
}
}

}
}
2 changes: 1 addition & 1 deletion confluence-plugin/src/main/resources/macroResources/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,4 @@ <h3 class="header" style="display: inline-block">Files</h3>
<script src="app.js"></script>

</body>
</html>
</html>
5 changes: 1 addition & 4 deletions confluence-plugin/src/main/resources/macroResources/macro.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,4 @@
#requireResourcesForContext("com.networkedassets.git4c.macroResources")
#requireResourcesForContext("com.networkedassets.git4c.sourcedialog")

<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" integrity="sha256-U//RSeH3TR3773Rk+1lAufJnRjEaG5LcdbvGV72kHEM=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" integrity="sha256-i0OqQaptcaStnjDX8HR+vkkvOLXoAUBAquwMvnqmLTU=" crossorigin="anonymous"></script>

$macroSectionHtml
$macroSectionHtml
6 changes: 2 additions & 4 deletions confluence-plugin/src/main/resources/singleFile/macro.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#requireResource("com.atlassian.auiplugin:aui-experimental-iconfont")
#requireResource("com.atlassian.auiplugin:aui-experimental-tooltips")
#requireResource("com.atlassian.auiplugin:aui-spinner")
#requireResourcesForContext('editor-v4,editor')
#requireResourcesForContext("com.networkedassets.git4c.vuejs")
#requireResourcesForContext("com.networkedassets.git4c.api")
#requireResourcesForContext("com.networkedassets.git4c.ajscompat")
Expand Down Expand Up @@ -34,9 +35,6 @@
<git4cinfodialog :edit-branch="editBranch" :original-branch-name="originalBranchName" :branch-name="branchName" :file-location="locationPath" :repository-name="repositoryName" ref="infodialog"></git4cinfodialog>
</div>

<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" integrity="sha256-U//RSeH3TR3773Rk+1lAufJnRjEaG5LcdbvGV72kHEM=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" integrity="sha256-i0OqQaptcaStnjDX8HR+vkkvOLXoAUBAquwMvnqmLTU=" crossorigin="anonymous"></script>

<script type="text/javascript">

AJS.toInit(function () {
Expand All @@ -52,4 +50,4 @@ AJS.toInit(function () {
})


</script>
</script>
4 changes: 2 additions & 2 deletions confluence-plugin/src/main/resources/singleFileDialog/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,8 +1207,8 @@
},
mounted: function () {
const vm = this
this.init()
this.getRepositoryList()
vm.init()
vm.getRepositoryList()
Bus.$on("closeCustomRepositoryDialog", function() {vm.closeCustomRepositoryDialog()})
Bus.$on("repositoryDefined", function(repository) {vm.processRepository(repository)})
}
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.networkedassets.git4c</groupId>
<artifactId>git4c</artifactId>
<packaging>pom</packaging>
<version>1.6.2-BETA1</version>
<version>1.6.2-BETA2</version>

<modules>
<module>confluence-plugin</module>
Expand All @@ -20,13 +20,13 @@
<logbackVersion>1.0.13</logbackVersion>
<jerseyVersion>2.24</jerseyVersion>
<jackson.version>2.8.4</jackson.version>
<confluence.version>7.0.0</confluence.version>
<confluence.data.version>7.0.0</confluence.data.version>
<confluence.version>7.4.6</confluence.version>
<confluence.data.version>7.4.6</confluence.data.version>
<atlassian.spring.scanner.version>1.2.6</atlassian.spring.scanner.version>
<!-- This key is used to keep the consistency between the key in atlassian-plugin.xml and the key to generate bundle. -->
<atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
<amps.version>8.1.0</amps.version>
<plugin.testrunner.version>1.2.3</plugin.testrunner.version>
<amps.version>8.2.0</amps.version>
<plugin.testrunner.version>2.0.2</plugin.testrunner.version>
<kotlin.version>1.1.60</kotlin.version>
</properties>

Expand Down Expand Up @@ -134,4 +134,4 @@
</build>


</project>
</project>
2 changes: 1 addition & 1 deletion seleniumtests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>git4c</artifactId>
<groupId>com.networkedassets.git4c</groupId>
<version>1.6.2-BETA1</version>
<version>1.6.2-BETA2</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down