From 6c249df6d5fc43d1912cb587b1f98a1af7b3bc2d Mon Sep 17 00:00:00 2001 From: Claudio Trajtenberg Date: Tue, 5 Jul 2016 07:36:57 -0500 Subject: [PATCH] Configured CI (#16) Closes #10. --- .gitignore | 38 +++--- README.md | 1 + appveyor.yml | 32 +++++ assembly/.gitignore | 2 +- demo/.gitignore | 2 +- .../src/main/resources/log4j2-application.xml | 114 ++++++++--------- demo/src/main/resources/log4j2.xml | 118 +++++++++--------- log4jna-api/.classpath | 62 ++++----- log4jna-api/.gitignore | 1 - log4jna-api/.project | 58 ++++----- log4jna-api/Readme.md | 4 +- log4jna-api/pom.xml | 1 - log4jna-api/src/.gitignore | 2 +- log4jna-api/src/site/site.xml | 50 ++++++++ pom.xml | 58 +++++---- win32dll/pom.xml | 7 ++ 16 files changed, 322 insertions(+), 228 deletions(-) create mode 100644 appveyor.yml delete mode 100644 log4jna-api/.gitignore create mode 100644 log4jna-api/src/site/site.xml diff --git a/.gitignore b/.gitignore index 41b75057..319bd22e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,19 @@ -build/date.properties -log4jna/src/win32dll/EventLogCategories.h -log4jna/src/win32dll/EventLogCategories.rc -log4jna/src/win32dll/MSG00001.bin -log4jna/src/win32dll/Win32EventLogAppender.res -log4jna/src/win32dll/target/ -log4jna/src/win32dll/version.rc -demo/bin -demo/build -demo/lib -log4jna/bin -log4jna/build -log4jna/doc -log4jna/lib-test -log4jna/lib -log4jna/test -target -.settings - +build/date.properties +log4jna/src/win32dll/EventLogCategories.h +log4jna/src/win32dll/EventLogCategories.rc +log4jna/src/win32dll/MSG00001.bin +log4jna/src/win32dll/Win32EventLogAppender.res +log4jna/src/win32dll/target/ +log4jna/src/win32dll/version.rc +demo/bin +demo/build +demo/lib +log4jna/bin +log4jna/build +log4jna/doc +log4jna/lib-test +log4jna/lib +log4jna/test +target +.settings + diff --git a/README.md b/README.md index b06eab77..70e6d35c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ Log4JNA ======= +[![Build status](https://ci.appveyor.com/api/projects/status/dre9sl70e8wegiti/branch/maven-conversion?svg=true)](https://ci.appveyor.com/project/claudiow/log4jna/branch/maven-conversion) ![Log4JNA](https://github.com/dblock/log4jna/raw/master/log4jna.jpg?raw=true "Log4JNA") diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..97ddef08 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,32 @@ +version: 2.0.{build} +os: Windows Server 2012 +branches: + only: + - maven-conversion +install: + - ps: | + Add-Type -AssemblyName System.IO.Compression.FileSystem + if (!(Test-Path -Path "C:\maven" )) { + (new-object System.Net.WebClient).DownloadFile( + 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip', + 'C:\maven-bin.zip' + ) + [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven") + } + - cmd: SET MAVEN_HOME=C:\maven\apache-maven-3.3.9 + - cmd: SET PATH=%MAVEN_HOME%\bin;%JAVA_HOME%\bin;%PATH% + - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g + - cmd: SET JAVA_OPTS=-Xmx4g + - cmd: mvn -version + - cmd: javac -version + +# For build and test we need to pass -Djna.nosys=true to avoid exception: +# java.lang.UnsatisfiedLinkError: Can't obtain updateLastError method for class com.sun.jna.Native +build_script: + - mvn clean install -B -Djna.nosys=true + +test_script: + - mvn clean -B test -Djna.nosys=true +cache: + - C:\maven\apache-maven-3.3.9 + - '%USERPROFILE%\.m2' diff --git a/assembly/.gitignore b/assembly/.gitignore index d027396d..caef298f 100644 --- a/assembly/.gitignore +++ b/assembly/.gitignore @@ -1 +1 @@ -/.settings/ +/.settings/ diff --git a/demo/.gitignore b/demo/.gitignore index d027396d..caef298f 100644 --- a/demo/.gitignore +++ b/demo/.gitignore @@ -1 +1 @@ -/.settings/ +/.settings/ diff --git a/demo/src/main/resources/log4j2-application.xml b/demo/src/main/resources/log4j2-application.xml index 03f24270..e2a3ce5d 100644 --- a/demo/src/main/resources/log4j2-application.xml +++ b/demo/src/main/resources/log4j2-application.xml @@ -1,57 +1,57 @@ - - - - - - - - - - - C:\Users\claudiow\git\log4jna\src\main\resources\Win32EventLogAppender.dll - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + C:\Users\claudiow\git\log4jna\src\main\resources\Win32EventLogAppender.dll + + + + + + + + + + + + + + + + + + + diff --git a/demo/src/main/resources/log4j2.xml b/demo/src/main/resources/log4j2.xml index aa4decfd..479f28b7 100644 --- a/demo/src/main/resources/log4j2.xml +++ b/demo/src/main/resources/log4j2.xml @@ -1,59 +1,59 @@ - - - - - - - - - - src\main\resources\Win32EventLogAppender.dll - - - - - - - - - - - - - - - - - - + + + + + + + + + + src\main\resources\Win32EventLogAppender.dll + + + + + + + + + + + + + + + + + + diff --git a/log4jna-api/.classpath b/log4jna-api/.classpath index d46faf10..273e16e1 100644 --- a/log4jna-api/.classpath +++ b/log4jna-api/.classpath @@ -1,31 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/log4jna-api/.gitignore b/log4jna-api/.gitignore deleted file mode 100644 index d027396d..00000000 --- a/log4jna-api/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.settings/ diff --git a/log4jna-api/.project b/log4jna-api/.project index 0d27bfb7..0e5f0e99 100644 --- a/log4jna-api/.project +++ b/log4jna-api/.project @@ -1,29 +1,29 @@ - - - log4jna-api - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - + + + log4jna-api + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/log4jna-api/Readme.md b/log4jna-api/Readme.md index 7b326c61..71b99a5e 100644 --- a/log4jna-api/Readme.md +++ b/log4jna-api/Readme.md @@ -1,2 +1,2 @@ -Work in progress maven migration. - +Work in progress maven migration. + diff --git a/log4jna-api/pom.xml b/log4jna-api/pom.xml index 67f68016..145f7224 100644 --- a/log4jna-api/pom.xml +++ b/log4jna-api/pom.xml @@ -24,7 +24,6 @@ maven-compiler-plugin - 3.3 1.8 1.8 diff --git a/log4jna-api/src/.gitignore b/log4jna-api/src/.gitignore index 46ff2463..44842d2e 100644 --- a/log4jna-api/src/.gitignore +++ b/log4jna-api/src/.gitignore @@ -1 +1 @@ -/site/ +/site/ diff --git a/log4jna-api/src/site/site.xml b/log4jna-api/src/site/site.xml new file mode 100644 index 00000000..812c0a40 --- /dev/null +++ b/log4jna-api/src/site/site.xml @@ -0,0 +1,50 @@ + + + + + + org.apache.maven.skins + maven-fluido-skin + 1.4 + + + + false + true + false + span2 + span10 + + + + ${project.name} + ${project.name} + ../parent/img/log4jna.jpg + log4jna + + + ${project.name} + ${project.name} + /index.html + + + + + + + + diff --git a/pom.xml b/pom.xml index 78eabf38..1c41f063 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 @@ -104,6 +103,11 @@ 1.8 + + org.apache.maven.plugins + maven-javadoc-plugin + ${mavenjavadocplugin.version} + @@ -114,6 +118,8 @@ 1.8 1.8 3.5.1 + 2.10.4 + UTF-8 @@ -142,29 +148,29 @@ test - - - sites - CGTCA Project Sites - scp://httpd.cgtca.ca/var/www/sites/log4jna/ - - - CGTCANexus - default - CGTCA Repo - Nexus Server Releases - http://repo.cgtca.ca:8081/nexus/content/repositories/releases/ - - - CGTCANexus - default - CGTCA Repo - Nexus Server Snapshots - http://repo.cgtca.ca:8081/nexus/content/repositories/snapshots/ - - - - log4jna-api - assembly - demo - win32dll - + + + sites + CGTCA Project Sites + scp://httpd.cgtca.ca/var/www/sites/log4jna/ + + + CGTCANexus + default + CGTCA Repo - Nexus Server Releases + http://repo.cgtca.ca:8081/nexus/content/repositories/releases/ + + + CGTCANexus + default + CGTCA Repo - Nexus Server Snapshots + http://repo.cgtca.ca:8081/nexus/content/repositories/snapshots/ + + + + win32dll + log4jna-api + demo + assembly + \ No newline at end of file diff --git a/win32dll/pom.xml b/win32dll/pom.xml index 41a26349..d7ffd2cb 100644 --- a/win32dll/pom.xml +++ b/win32dll/pom.xml @@ -35,6 +35,13 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + \ No newline at end of file