Author: solomax
Date: Thu Sep 24 05:32:59 2015
New Revision: 1704990
URL: http://svn.apache.org/viewvc?rev=1704990&view=rev
Log:
Attlassian plugins are semi-fixed
Removed:
openmeetings/branches/jira-plugin/.classpath
openmeetings/branches/jira-plugin/.project
openmeetings/branches/jira-plugin/.settings/
openmeetings/branches/jira-plugin/target/
Modified:
openmeetings/branches/confluence-plugin/pom.xml
openmeetings/branches/jira-plugin/ (props changed)
openmeetings/branches/jira-plugin/README
openmeetings/branches/jira-plugin/pom.xml
Modified: openmeetings/branches/confluence-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/confluence-plugin/pom.xml?rev=1704990&r1=1704989&r2=1704990&view=diff
==============================================================================
--- openmeetings/branches/confluence-plugin/pom.xml (original)
+++ openmeetings/branches/confluence-plugin/pom.xml Thu Sep 24 05:32:59 2015
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>com.openmeetings.confluence.plugins</groupId>
+ <groupId>org.openmeetings.confluence.plugin</groupId>
<artifactId>openmeetingsconfluence</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -26,7 +26,7 @@
<properties>
<confluence.version>4.0</confluence.version>
<confluence.data.version>3.5</confluence.data.version>
- <amps.version>6.0.6</amps.version>
+ <amps.version>6.0.8</amps.version>
<ao.version>0.9.6</ao.version>
<http.client.version>4.4.1</http.client.version>
<slf4j.version>1.7.12</slf4j.version>
Propchange: openmeetings/branches/jira-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Sep 24 05:32:59 2015
@@ -1,2 +1,6 @@
target
backup_target
+.classpath
+.project
+.settings
+
Modified: openmeetings/branches/jira-plugin/README
URL:
http://svn.apache.org/viewvc/openmeetings/branches/jira-plugin/README?rev=1704990&r1=1704989&r2=1704990&view=diff
==============================================================================
--- openmeetings/branches/jira-plugin/README (original)
+++ openmeetings/branches/jira-plugin/README Thu Sep 24 05:32:59 2015
@@ -11,3 +11,19 @@ Here are the SDK commands you'll use imm
Full documentation is always available at:
https://developer.atlassian.com/display/DOCS/Developing+with+the+Atlassian+Plugin+SDK
+
+
+
+To build you need to
+
+1) download JNDI from here:
+http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-plat-419418.html
+
+2) unzip, then install
+mvn install:install-file -Dfile=jndi.jar -DgroupId=jndi -DartifactId=jndi
-Dpackaging=jar -Dversion=1.2.1
+
+3) download JTA from here:
+http://www.oracle.com/technetwork/java/javaee/jta/index.html
+
+4) unzip, then install
+mvn install:install-file -Dfile=jndi.jar -DgroupId=jta -DartifactId=jta
-Dpackaging=jar -Dversion=1.0.1
Modified: openmeetings/branches/jira-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/jira-plugin/pom.xml?rev=1704990&r1=1704989&r2=1704990&view=diff
==============================================================================
--- openmeetings/branches/jira-plugin/pom.xml (original)
+++ openmeetings/branches/jira-plugin/pom.xml Thu Sep 24 05:32:59 2015
@@ -1,129 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.openmeetings.jira.plugin</groupId>
- <artifactId>openmeetings</artifactId>
- <packaging>atlassian-plugin</packaging>
- <name>openmeetings</name>
- <version>1.0-SNAPSHOT</version>
- <description>This is the OpenMeetings plugin for Atlassian JIRA. It
integrates
- OpenMeeting-Webconferncing with JIRA.</description>
- <organization>
- <name>Eugen Schwert</name>
- <url>http://www.e-schwert.de/</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-jira-plugin</artifactId>
- <version>3.7.2</version>
- <extensions>true</extensions>
- <configuration>
- <pluginArtifacts>
- <pluginArtifact>
-
<groupId>com.atlassian.activeobjects</groupId>
-
<artifactId>activeobjects-plugin</artifactId>
- <version>0.9.6</version>
- </pluginArtifact>
- <pluginArtifact>
-
<groupId>com.atlassian.activeobjects</groupId>
-
<artifactId>activeobjects-jira-spi</artifactId>
- <version>0.9.6</version>
- </pluginArtifact>
- </pluginArtifacts>
- <productVersion>${jira.version}</productVersion>
- <productDataVersion>${jira.data.version}</productDataVersion>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>com.atlassian.jira</groupId>
- <artifactId>atlassian-jira</artifactId>
- <version>${jira.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.atlassian.jira</groupId>
- <artifactId>jira-func-tests</artifactId>
- <version>${jira.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.atlassian.templaterenderer</groupId>
- <artifactId>atlassian-template-renderer-api</artifactId>
- <version>1.3.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.atlassian.sal</groupId>
- <artifactId>sal-api</artifactId>
- <version>2.0.16</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.atlassian.activeobjects</groupId>
- <artifactId>activeobjects-plugin</artifactId>
- <version>0.9.6</version>
- <scope>provided</scope>
- </dependency>
- <!-- Google Collections, useful utilities for manipulating collections
-->
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <properties>
- <amps.version>3.7.2</amps.version>
- <jira.version>5.0</jira.version>
- <jira.data.version>5.0</jira.data.version>
- </properties>
+<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/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.openmeetings.jira.plugin</groupId>
+ <artifactId>openmeetings</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <organization>
+ <name>Eugen Schwert</name>
+ <url>http://www.e-schwert.de/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <name>openmeetings</name>
+ <description>This is the OpenMeetings plugin for Atlassian JIRA. It
integrates
+ OpenMeeting-Webconferncing with JIRA.</description>
+ <packaging>atlassian-plugin</packaging>
+
+ <properties>
+ <jira.version>5.0</jira.version>
+ <jira.data.version>5.0</jira.data.version>
+ <amps.version>6.0.8</amps.version>
+ <ao.version>0.9.6</ao.version>
+ <http.client.version>4.4.1</http.client.version>
+ <slf4j.version>1.7.12</slf4j.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>atlassian-public</id>
+
<url>https://maven.atlassian.com/content/groups/public/</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>atlassian-public</id>
+
<url>https://maven.atlassian.com/content/groups/public/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>com.atlassian.jira</groupId>
+ <artifactId>atlassian-jira</artifactId>
+ <version>${jira.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.atlassian.templaterenderer</groupId>
+ <artifactId>atlassian-template-renderer-api</artifactId>
+ <version>1.3.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.atlassian.sal</groupId>
+ <artifactId>sal-api</artifactId>
+ <version>2.0.16</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.atlassian.activeobjects</groupId>
+ <artifactId>activeobjects-plugin</artifactId>
+ <version>${ao.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Google Collections, useful utilities for manipulating
collections -->
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.atlassian.jira</groupId>
+ <artifactId>jira-func-tests</artifactId>
+ <version>${jira.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${http.client.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-jira-plugin</artifactId>
+ <version>${amps.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <pluginArtifacts>
+ <pluginArtifact>
+
<groupId>com.atlassian.activeobjects</groupId>
+
<artifactId>activeobjects-plugin</artifactId>
+ <version>0.9.6</version>
+ </pluginArtifact>
+ <pluginArtifact>
+
<groupId>com.atlassian.activeobjects</groupId>
+
<artifactId>activeobjects-jira-spi</artifactId>
+ <version>0.9.6</version>
+ </pluginArtifact>
+ </pluginArtifacts>
+
<productVersion>${jira.version}</productVersion>
+
<productDataVersion>${jira.data.version}</productDataVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
