diff --git a/.gitignore b/.gitignore index 0861ab5..c66434c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ target */.classpath */.project */.settings +*/build +build +.idea +.gradle \ No newline at end of file diff --git a/actions/build.gradle b/actions/build.gradle new file mode 100644 index 0000000..f90b849 --- /dev/null +++ b/actions/build.gradle @@ -0,0 +1,16 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.ibm.common.java-conventions' +} + +dependencies { + implementation project(':activitystreams-core') + implementation 'com.google.code.gson:gson:2.2.4' + implementation 'com.google.guava:guava:16.0.1' + testImplementation 'junit:junit:4.11' +} + +description = 'Activity Streams 2.0 - Actions' diff --git a/actions/pom.xml b/actions/pom.xml deleted file mode 100644 index 0d074df..0000000 --- a/actions/pom.xml +++ /dev/null @@ -1,142 +0,0 @@ - - 4.0.0 - - com.ibm.common - activitystreams - 0.0.1-SNAPSHOT - - activitystreams-actions - Activity Streams 2.0 - Actions - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - UTF-8 - UTF-8 - UTF-8 - -XDignore.symbol.file - public - - http://www.joda.org/joda-time/apidocs - http://docs.guava-libraries.googlecode.com/git-history/v16.0.1/javadoc/ - - - - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - - maven-jar-plugin - 2.3.1 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - bundle-manifest - process-classes - - manifest - - - - - - com.ibm.common.activitystreams.actions.* - - com.ibm.common.activitystreams.*, - com.google.gson.*, - com.google.common.*, - org.joda.time.* - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.2 - - - assembly.xml - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [2.3.7,) - - manifest - - - - - - - - - - - - - - - - - com.ibm.common - activitystreams-core - 0.0.1-SNAPSHOT - - - junit - junit - - - \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 0000000..04d80d2 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + id 'groovy-gradle-plugin' +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} diff --git a/buildSrc/src/main/groovy/com.ibm.common.java-conventions.gradle b/buildSrc/src/main/groovy/com.ibm.common.java-conventions.gradle new file mode 100644 index 0000000..0b04566 --- /dev/null +++ b/buildSrc/src/main/groovy/com.ibm.common.java-conventions.gradle @@ -0,0 +1,31 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java-library' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +group = 'com.ibm.common' +version = '0.0.1-SNAPSHOT' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 0000000..5b423e5 --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,16 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.ibm.common.java-conventions' +} + +dependencies { + implementation 'com.google.code.gson:gson:2.2.4' + implementation 'com.google.guava:guava:16.0.1' + implementation 'joda-time:joda-time:2.3' + testImplementation 'junit:junit:4.11' +} + +description = 'Activity Streams 2.0 - Core' diff --git a/core/pom.xml b/core/pom.xml deleted file mode 100755 index 3866b60..0000000 --- a/core/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - com.ibm.common - activitystreams - 0.0.1-SNAPSHOT - - - 4.0.0 - activitystreams-core - jar - - Activity Streams 2.0 - Core - http://github.org/opensocial/activitystreams - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - UTF-8 - - - - - com.google.code.gson - gson - - - com.google.guava - guava - - - joda-time - joda-time - - - - junit - junit - test - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - UTF-8 - UTF-8 - UTF-8 - -XDignore.symbol.file - public - - http://www.joda.org/joda-time/apidocs - http://docs.guava-libraries.googlecode.com/git-history/v16.0.1/javadoc/ - - - - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - - maven-jar-plugin - 2.3.1 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - bundle-manifest - process-classes - - manifest - - - - - - com.ibm.common.activitystreams.* - - com.google.gson.*, - com.google.common.*, - org.joda.time.* - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.2 - - - assembly.xml - - - - - - - - - diff --git a/core/src/main/java/com/ibm/common/activitystreams/ASObject.java b/core/src/main/java/com/ibm/common/activitystreams/ASObject.java index 005bf07..3986f0a 100755 --- a/core/src/main/java/com/ibm/common/activitystreams/ASObject.java +++ b/core/src/main/java/com/ibm/common/activitystreams/ASObject.java @@ -1478,22 +1478,6 @@ public B set(String key, Supplier value) { } } - /** - * Set a property from a given callable - * @param key String - * @param value Callable - * @return B - **/ - public B set(String key, Callable value) { - try { - return value == null ? - (B)this : - set(key,value.call()); - } catch (Throwable t) { - throw propagate(t); - } - } - /** * Set the scope * @param url String diff --git a/geo/build.gradle b/geo/build.gradle new file mode 100644 index 0000000..802cfdb --- /dev/null +++ b/geo/build.gradle @@ -0,0 +1,15 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.ibm.common.java-conventions' +} + +dependencies { + implementation project(':activitystreams-core') + implementation 'com.google.code.gson:gson:2.2.4' + implementation 'com.google.guava:guava:16.0.1' +} + +description = 'Activity Streams 2.0 - GeoJSON' diff --git a/geo/pom.xml b/geo/pom.xml deleted file mode 100755 index 7ad5ef9..0000000 --- a/geo/pom.xml +++ /dev/null @@ -1,141 +0,0 @@ - - 4.0.0 - - com.ibm.common - activitystreams - 0.0.1-SNAPSHOT - - activitystreams-geo - Activity Streams 2.0 - GeoJSON - - A GeoJSON Implementation that can be used standalone or with the IBM Activity Streams 2.0 Reference Implementation - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - UTF-8 - UTF-8 - UTF-8 - -XDignore.symbol.file - public - - http://www.joda.org/joda-time/apidocs - http://docs.guava-libraries.googlecode.com/git-history/v16.0.1/javadoc/ - - - - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - - maven-jar-plugin - 2.3.1 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - bundle-manifest - process-classes - - manifest - - - - - - com.ibm.common.geojson.* - - com.ibm.common.activitystreams.*, - com.google.gson.*, - com.google.common.*, - org.joda.time.* - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.2 - - - assembly.xml - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [2.3.7,) - - manifest - - - - - - - - - - - - - - - - - com.ibm.common - activitystreams-core - 0.0.1-SNAPSHOT - - - - \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3ae1e2f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/legacy/build.gradle b/legacy/build.gradle new file mode 100644 index 0000000..6778304 --- /dev/null +++ b/legacy/build.gradle @@ -0,0 +1,16 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.ibm.common.java-conventions' +} + +dependencies { + implementation project(':activitystreams-core') + implementation 'joda-time:joda-time:2.3' + implementation 'com.google.code.gson:gson:2.2.4' + implementation 'com.google.guava:guava:16.0.1' +} + +description = 'Activity Streams 2.0 - Legacy objectTypes' diff --git a/legacy/pom.xml b/legacy/pom.xml deleted file mode 100644 index 25e6f3f..0000000 --- a/legacy/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - 4.0.0 - - com.ibm.common - activitystreams - 0.0.1-SNAPSHOT - - activitystreams-legacy - Activity Streams 2.0 - Legacy objectTypes - - - Implementation of Legacy Activity Streams 1.0 objectTypes for - use with the Activity Streams 2.0 Reference Implementation - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - UTF-8 - UTF-8 - UTF-8 - -XDignore.symbol.file - public - - http://www.joda.org/joda-time/apidocs - http://docs.guava-libraries.googlecode.com/git-history/v16.0.1/javadoc/ - - - - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - - maven-jar-plugin - 2.3.1 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - bundle-manifest - process-classes - - manifest - - - - - - com.ibm.common.activitystreams.legacy.* - - com.ibm.common.activitystreams.*, - com.google.gson.*, - com.google.common.*, - org.joda.time.* - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.2 - - - assembly.xml - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [2.3.7,) - - manifest - - - - - - - - - - - - - - - - - com.ibm.common - activitystreams-core - 0.0.1-SNAPSHOT - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index e8b7f52..0000000 --- a/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - 4.0.0 - com.ibm.common - activitystreams - 0.0.1-SNAPSHOT - pom - Activity Streams 2.0 Java Reference Implementation - - - - jasnell - James M Snell - jasnell@us.ibm.com - IBM - http://www.ibm.com - - owner - developer - - -8 - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - IBM - http://www.ibm.com - - - scm:https://github.com/OpenSocial/incubator.git - http://github.com/OpenSocial/activitystreams - - - - UTF-8 - - - - core - actions - geo - assembly - legacy - typext - - - - - com.google.code.gson - gson - 2.2.4 - - - com.google.guava - guava - 16.0.1 - - - joda-time - joda-time - 2.3 - - - - junit - junit - 4.11 - test - - - - http://github.com/OpenSocial/activitystreams - An implementation of the Activity Streams 2.0 data format. - 2013 - - https://github.com/OpenSocial/activitystreams/issues - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5663ad6 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'activitystreams' +include(':activitystreams-core') +include(':activitystreams-actions') +include(':activitystreams-legacy') +include(':assembly') +include(':activitystreams-geo') +include(':activitystreams-ext') +project(":activitystreams-core").projectDir = file('core') +project(":activitystreams-actions").projectDir = file('actions') +project(":activitystreams-legacy").projectDir = file('legacy') +project(":activitystreams-geo").projectDir = file('geo') +project(":activitystreams-ext").projectDir = file('typext') diff --git a/typext/build.gradle b/typext/build.gradle new file mode 100644 index 0000000..d0d927e --- /dev/null +++ b/typext/build.gradle @@ -0,0 +1,18 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.ibm.common.java-conventions' +} + +dependencies { + implementation project(':activitystreams-core') + implementation 'org.apache.httpcomponents:httpclient-cache:4.3.3' + implementation 'org.apache.httpcomponents:httpcomponents-client:4.3.3' + implementation 'com.google.code.gson:gson:2.2.4' + implementation 'com.google.guava:guava:16.0.1' + testImplementation 'junit:junit:4.11' +} + +description = 'Activity Streams 2.0 - Type Extension Support' diff --git a/typext/pom.xml b/typext/pom.xml deleted file mode 100644 index 9966778..0000000 --- a/typext/pom.xml +++ /dev/null @@ -1,157 +0,0 @@ - - 4.0.0 - - com.ibm.common - activitystreams - 0.0.1-SNAPSHOT - - activitystreams-ext - Activity Streams 2.0 - Type Extension Support - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - UTF-8 - UTF-8 - UTF-8 - -XDignore.symbol.file - public - - http://www.joda.org/joda-time/apidocs - http://docs.guava-libraries.googlecode.com/git-history/v16.0.1/javadoc/ - - - - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - - maven-jar-plugin - 2.3.1 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - bundle-manifest - process-classes - - manifest - - - - - - - com.ibm.common.activitystreams.ext.*, - com.ibm.common.activitystreams.registry.* - - - com.ibm.common.activitystreams.*, - com.google.gson.*, - com.google.common.*, - org.joda.time.*, - org.apache.http.*, - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.2 - - - assembly.xml - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [2.3.7,) - - manifest - - - - - - - - - - - - - - - - - com.ibm.common - activitystreams-core - 0.0.1-SNAPSHOT - - - org.apache.httpcomponents - httpclient-cache - 4.3.3 - - - org.apache.httpcomponents - httpcomponents-client - 4.3.3 - pom - - - junit - junit - - - \ No newline at end of file