Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge with master | Jon Bratseth | 2017-12-13 | 1 | -3/+7 | |
|\ | ||||||
| * | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-12-01 | 1 | -938/+4 | |
| | | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | |||||
| * | Revert "Gjoranv/split parent2" | gjoranv | 2017-11-30 | 1 | -4/+938 | |
| | | ||||||
| * | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-30 | 1 | -938/+4 | |
| | | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | |||||
| * | Revert "Gjoranv/split parent" | gjoranv | 2017-11-29 | 1 | -4/+938 | |
| | | ||||||
| * | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-29 | 1 | -938/+4 | |
| | | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | |||||
* | | Merge with master | Jon Bratseth | 2017-11-28 | 1 | -1/+7 | |
|\| | ||||||
| * | Change repository url to HTTPS | Masakazu Nagaya | 2017-11-10 | 1 | -1/+1 | |
| | | ||||||
| * | Move commons-logging version to parent pom. | gjoranv | 2017-11-08 | 1 | -0/+6 | |
| | | ||||||
* | | TF model translation WIP | Jon Bratseth | 2017-11-07 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #3830 from ↵ | Morten Tokle | 2017-10-23 | 1 | -0/+6 | |
|\ | | | | | | | | | vespa-engine/bjorncs/athenz-identity-provider-service Initial Athenz copper argos implementation | |||||
| * | Add Athenz Identity Provider Service | Bjørn Christian Seime | 2017-10-18 | 1 | -0/+6 | |
| | | ||||||
* | | Remove Scala code in test | Håkon Hallingstad | 2017-10-20 | 1 | -5/+0 | |
|/ | ||||||
* | Use BouncyCastle 1.58 | Bjørn Christian Seime | 2017-10-17 | 1 | -1/+1 | |
| | ||||||
* | Remove duplicate 'repositories' element | Bjørn Christian Seime | 2017-10-16 | 1 | -12/+0 | |
| | ||||||
* | Open-source Athenz integration for controller-server | Bjørn Christian Seime | 2017-10-16 | 1 | -0/+12 | |
| | ||||||
* | Add Athenz dependencies to parent pom.xml | Bjørn Christian Seime | 2017-10-16 | 1 | -0/+22 | |
| | ||||||
* | Revert "Open-source Athenz integration for controller-server" | Bjørn Christian Seime | 2017-10-16 | 1 | -22/+0 | |
| | | | | This reverts commit 2d12b78dc2dd3a755e9a9dd05fa7f98acb2f544c. | |||||
* | Use maven-dependency-plugin 2.10 | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into gjoranv/container-test | gjoranv | 2017-10-16 | 1 | -0/+24 | |
|\ | ||||||
| * | Open-source Athenz integration for controller-server | Bjørn Christian Seime | 2017-10-16 | 1 | -0/+24 | |
| | | ||||||
* | | Add dependency management for jackson-dataformat-xml. | gjoranv | 2017-10-13 | 1 | -0/+5 | |
| | | | | | | | | + remove some unnecessary version from vespa-http-client pom. | |||||
* | | Add container-test module to aggregator pom. | gjoranv | 2017-10-13 | 1 | -0/+1 | |
| | | ||||||
* | | Add property for commons-lang version. | gjoranv | 2017-10-13 | 1 | -1/+2 | |
|/ | | | | - To be referenced from container-test. | |||||
* | Remove unused java persistence implementation. | Tor Egge | 2017-10-09 | 1 | -2/+0 | |
| | ||||||
* | Open-source PEM keystore for JDisc | Bjørn Christian Seime | 2017-10-09 | 1 | -0/+10 | |
| | ||||||
* | Revert "Upgrade surefire to 2.20.1" | Harald Musum | 2017-10-03 | 1 | -1/+1 | |
| | ||||||
* | Upgrade surefire to 2.20.1 | Bjørn Christian Seime | 2017-10-03 | 1 | -1/+1 | |
| | | | | | Surefire 2.20.x improves debug output for build failures. Let's give it a try. | |||||
* | Enforce predefined set of allowed provided container deps. | gjoranv | 2017-09-25 | 1 | -0/+1 | |
| | ||||||
* | Provide bouncycastle on test classpath. | gjoranv | 2017-09-22 | 1 | -1/+2 | |
| | ||||||
* | Revert "Use Jetty v9.4.7" | Arnstein Ressem | 2017-09-20 | 1 | -1/+1 | |
| | ||||||
* | Use Jetty v9.4.7 | Bjørn Christian Seime | 2017-09-20 | 1 | -1/+1 | |
| | | | | | Upgrade to newest Jetty and add support for empty HTTP header values. Release notes Jetty: http://dev.eclipse.org/mhonarc/lists/jetty-announce/msg00111.html | |||||
* | Revert "Upgrade to Curator 2.12.0" | Harald Musum | 2017-09-18 | 1 | -1/+1 | |
| | ||||||
* | Upgrade to Curator 2.12.0 | Harald Musum | 2017-09-15 | 1 | -1/+1 | |
| | ||||||
* | Move comment to where version is defined | Harald Musum | 2017-09-15 | 1 | -6/+6 | |
| | ||||||
* | Revert "Install net.jpountz.lz4:lz4 as a bundle." | Harald Musum | 2017-09-14 | 1 | -2/+1 | |
| | ||||||
* | Install net.jpountz.lz4:lz4 as a bundle. | gjoranv | 2017-09-14 | 1 | -1/+2 | |
| | | | | | | | | | - From vespajlib. - It must still be a compile scope dep in order to make it a transitive dep for dependents of vespajlib. (Important to allow using vespajlib as a library outside the jdisc container.) - Hence, lz4 is still on the bundle classpath, but the explicitly added Import-Package overrides the bundle classpath. | |||||
* | Expose HdrHistogram in test scope instead of provided for users. | gjoranv | 2017-09-11 | 1 | -0/+5 | |
| | | | | | | - It's not provided runtime, but we should consider doing so, as simplemetric:UntypedMetric exposes a public method that returns an org.HdrHistogram.DoubleHistogram. | |||||
* | Make antlr and antlr4 invisible for customer projects. | gjoranv | 2017-09-01 | 1 | -2/+9 | |
| | | | | - Visible only in test classpath. | |||||
* | Remove Netty by replacing cookie codec with Jetty + Java SE | Bjørn Christian Seime | 2017-09-01 | 1 | -5/+0 | |
| | ||||||
* | Upgrade plugin to reduce log spam | Bjørn Christian Seime | 2017-08-31 | 1 | -1/+1 | |
| | ||||||
* | Revert "Make antlr and antlr4 invisible for customer projects." | Arnstein Ressem | 2017-08-31 | 1 | -9/+2 | |
| | ||||||
* | Revert "Bjorncs/remove netty" | Harald Musum | 2017-08-30 | 1 | -0/+5 | |
| | ||||||
* | Merge pull request #3271 from ↵ | Bjørn Christian Seime | 2017-08-30 | 1 | -2/+9 | |
|\ | | | | | | | | | vespa-engine/gjoranv/exclude-antlr-from-provided-deps Make antlr and antlr4 invisible for customer projects. | |||||
| * | Make antlr and antlr4 invisible for customer projects. | gjoranv | 2017-08-30 | 1 | -2/+9 | |
| | | | | | | | | - Visible only in test classpath. | |||||
* | | Remove Netty by replacing cookie codec with Jetty + Java SE | Bjørn Christian Seime | 2017-08-30 | 1 | -5/+0 | |
| | | ||||||
* | | Revert "Remove Netty by replacing cookie codec with Jetty + Java SE" | Henning Baldersheim | 2017-08-29 | 1 | -0/+5 | |
| | | ||||||
* | | Remove Netty by replacing cookie codec with Jetty + Java SE | Bjørn Christian Seime | 2017-08-29 | 1 | -5/+0 | |
|/ | ||||||
* | Import controller | Martin Polden | 2017-08-24 | 1 | -0/+2 | |
| | ||||||
* | Specify version of maven-antrun-plugin | Bjørn Christian Seime | 2017-08-21 | 1 | -0/+5 | |
| |